6 files changed, 15 insertions, 16 deletions

diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index 50c56e2814c..1a7ca37168b 100644
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -494,10 +494,8 @@ mpc52xx_ata_resume(struct of_device *op)
 
 
 static struct of_device_id mpc52xx_ata_of_match[] = {
-        {
-                .type           = "ata",
-                .compatible     = "mpc5200-ata",
-        },
+        { .compatible = "fsl,mpc5200-ata", },
+        { .compatible = "mpc5200-ata", },
         {},
 };
 
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index f91ee700e60..58b71e60204 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -1057,10 +1057,8 @@ static int mpc52xx_fec_of_resume(struct of_device *op)
 #endif
 
 static struct of_device_id mpc52xx_fec_match[] = {
-        {
-                .type           = "network",
-                .compatible     = "mpc5200-fec",
-        },
+        { .type = "network", .compatible = "fsl,mpc5200-fec", },
+        { .type = "network", .compatible = "mpc5200-fec", },
         { }
 };
 
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c
index ba6e8b218e0..1837584c450 100644
--- a/drivers/net/fec_mpc52xx_phy.c
+++ b/drivers/net/fec_mpc52xx_phy.c
@@ -177,11 +177,9 @@ static int mpc52xx_fec_mdio_remove(struct of_device *of)
 
 
 static struct of_device_id mpc52xx_fec_mdio_match[] = {
-        {
-                .type = "mdio",
-                .compatible = "mpc5200b-fec-phy",
-        },
-        {},
+        { .compatible = "fsl,mpc5200b-mdio", },
+        { .compatible = "mpc5200b-fec-phy", },
+        {}
 };
 
 struct of_platform_driver mpc52xx_fec_mdio_driver = {
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 1e3721a0eef..3c4d29e59b2 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -130,7 +130,9 @@ static irqreturn_t mpc52xx_uart_int(int irq, void *dev_id);
 
 #if defined(CONFIG_PPC_MERGE)
 static struct of_device_id mpc52xx_uart_of_match[] = {
-        { .type = "serial", .compatible = "mpc5200-psc-uart", },
+        { .type = "serial", .compatible = "fsl,mpc5200-psc-uart", },
+        { .type = "serial", .compatible = "mpc5200-psc-uart", }, /* lite5200 */
+        { .type = "serial", .compatible = "mpc5200-serial", }, /* efika */
         {},
 };
 #endif
diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c
index d398c93195e..a3ebc632a47 100644
--- a/drivers/spi/mpc52xx_psc_spi.c
+++ b/drivers/spi/mpc52xx_psc_spi.c
@@ -628,8 +628,9 @@ static int __exit mpc52xx_psc_spi_of_remove(struct of_device *op)
 }
 
 static struct of_device_id mpc52xx_psc_spi_of_match[] = {
-        { .type = "spi", .compatible = "mpc5200-psc-spi", },
-        {},
+        { .compatible = "fsl,mpc5200-psc-spi", },
+        { .compatible = "mpc5200-psc-spi", }, /* old */
+        {}
 };
 
 MODULE_DEVICE_TABLE(of, mpc52xx_psc_spi_of_match);
diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c
index 0c3e6b790b7..a6725279122 100644
--- a/drivers/usb/host/ohci-ppc-of.c
+++ b/drivers/usb/host/ohci-ppc-of.c
@@ -136,6 +136,8 @@ ohci_hcd_ppc_of_probe(struct of_device *op, const struct of_device_id *match)
         ohci = hcd_to_ohci(hcd);
         if (is_bigendian) {
                 ohci->flags |= OHCI_QUIRK_BE_MMIO | OHCI_QUIRK_BE_DESC;
+                if (of_device_is_compatible(dn, "fsl,mpc5200-ohci"))
+                        ohci->flags |= OHCI_QUIRK_FRAME_NO;
                 if (of_device_is_compatible(dn, "mpc5200-ohci"))
                         ohci->flags |= OHCI_QUIRK_FRAME_NO;
         }