[POWERPC] mpc5200: normalize compatible property bindings

Update MPC5200 drivers to also look for compatible properties in the
form "fsl,mpc5200-*" to better conform to open firmware generic names
recommended practice as published here:

http://www.openfirmware.org/1275/practice/gnames/gnamv14a.html

This patch should *not* break compatibility with older device trees
which do not use the 'fsl,' prefix.  The drivers will still bind against
the older names also.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c
index 5a8d190f53e4303a86037d4eaa6e688f050d1614..fb35b285a146ccf2b3b4e589f51d259db20f0b8d 100644 (file)
--- a/arch/powerpc/platforms/52xx/lite5200.c
+++ b/arch/powerpc/platforms/52xx/lite5200.c
@@ -32,6 +32,19 @@
  *
  */
 
+/* mpc5200 device tree match tables */
+static struct of_device_id mpc5200_cdm_ids[] __initdata = {
+       { .compatible = "fsl,mpc5200-cdm", },
+       { .compatible = "mpc5200-cdm", },
+       {}
+};
+
+static struct of_device_id mpc5200_gpio_ids[] __initdata = {
+       { .compatible = "fsl,mpc5200-gpio", },
+       { .compatible = "mpc5200-gpio", },
+       {}
+};
+
 /*
  * Fix clock configuration.
  *
@@ -44,9 +57,8 @@ lite5200_fix_clock_config(void)
 {
        struct device_node *np;
        struct mpc52xx_cdm  __iomem *cdm;
-
        /* Map zones */
-       np = of_find_compatible_node(NULL, NULL, "mpc5200-cdm");
+       np = of_find_matching_node(NULL, mpc5200_cdm_ids);
        cdm = of_iomap(np, 0);
        of_node_put(np);
        if (!cdm) {
@@ -81,7 +93,7 @@ lite5200_fix_port_config(void)
        struct mpc52xx_gpio __iomem *gpio;
        u32 port_config;
 
-       np = of_find_compatible_node(NULL, NULL, "mpc5200-gpio");
+       np = of_find_matching_node(NULL, mpc5200_gpio_ids);
        gpio = of_iomap(np, 0);
        of_node_put(np);
        if (!gpio) {

diff --git a/arch/powerpc/platforms/52xx/lite5200_pm.c b/arch/powerpc/platforms/52xx/lite5200_pm.c
index c3ada1e340d255ab05f8c711bb02545fd768af47..c0f13e8deb0b482936528761e040fd8fd026e048 100644 (file)
--- a/arch/powerpc/platforms/52xx/lite5200_pm.c
+++ b/arch/powerpc/platforms/52xx/lite5200_pm.c
@@ -43,6 +43,13 @@ static int lite5200_pm_set_target(suspend_state_t state)
 static int lite5200_pm_prepare(void)
 {
        struct device_node *np;
+       const struct of_device_id immr_ids[] = {
+               { .compatible = "fsl,mpc5200-immr", },
+               { .compatible = "fsl,mpc5200b-immr", },
+               { .type = "soc", .compatible = "mpc5200", }, /* lite5200 */
+               { .type = "builtin", .compatible = "mpc5200", }, /* efika */
+               {}
+       };
 
        /* deep sleep? let mpc52xx code handle that */
        if (lite5200_pm_target_state == PM_SUSPEND_STANDBY)
@@ -52,7 +59,7 @@ static int lite5200_pm_prepare(void)
                return -EINVAL;
 
        /* map registers */
-       np = of_find_compatible_node(NULL, NULL, "mpc5200");
+       np = of_find_matching_node(NULL, immr_ids);
        mbar = of_iomap(np, 0);
        of_node_put(np);
        if (!mbar) {

diff --git a/arch/powerpc/platforms/52xx/mpc52xx_common.c b/arch/powerpc/platforms/52xx/mpc52xx_common.c
index 66955937be2a9d32ffc3e4ad1888fbee7df9df4b..744eb3a34ec989508d727167e17c16f7b183aeea 100644 (file)
--- a/arch/powerpc/platforms/52xx/mpc52xx_common.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_common.c
@@ -18,6 +18,23 @@
 #include <asm/prom.h>
 #include <asm/mpc52xx.h>
 
+/* MPC5200 device tree match tables */
+static struct of_device_id mpc52xx_xlb_ids[] __initdata = {
+       { .compatible = "fsl,mpc5200-xlb", },
+       { .compatible = "mpc5200-xlb", },
+       {}
+};
+static struct of_device_id mpc52xx_bus_ids[] __initdata = {
+       { .compatible = "fsl,mpc5200-immr", },
+       { .compatible = "fsl,mpc5200b-immr", },
+       { .compatible = "fsl,lpb", },
+
+       /* depreciated matches; shouldn't be used in new device trees */
+       { .type = "builtin", .compatible = "mpc5200", }, /* efika */
+       { .type = "soc", .compatible = "mpc5200", }, /* lite5200 */
+       {}
+};
+
 /*
  * This variable is mapped in mpc52xx_map_wdt() and used in mpc52xx_restart().
  * Permanent mapping is required because mpc52xx_restart() can be called
@@ -65,7 +82,7 @@ mpc5200_setup_xlb_arbiter(void)
        struct device_node *np;
        struct mpc52xx_xlb  __iomem *xlb;
 
-       np = of_find_compatible_node(NULL, NULL, "mpc5200-xlb");
+       np = of_find_matching_node(NULL, mpc52xx_xlb_ids);
        xlb = of_iomap(np, 0);
        of_node_put(np);
        if (!xlb) {
@@ -88,16 +105,11 @@ mpc5200_setup_xlb_arbiter(void)
        iounmap(xlb);
 }
 
-static struct of_device_id mpc52xx_bus_ids[] __initdata= {
-       { .compatible = "fsl,mpc5200-immr", },
-       { .compatible = "fsl,lpb", },
-
-       /* depreciated matches; shouldn't be used in new device trees */
-       { .type = "builtin", .compatible = "mpc5200", }, /* efika */
-       { .type = "soc", .compatible = "mpc5200", }, /* lite5200 */
-       {},
-};
-
+/**
+ * mpc52xx_declare_of_platform_devices: register internal devices and children
+ *                                     of the localplus bus to the of_platform
+ *                                     bus.
+ */
 void __init
 mpc52xx_declare_of_platform_devices(void)
 {
@@ -107,33 +119,31 @@ mpc52xx_declare_of_platform_devices(void)
                        "Error while probing of_platform bus\n");
 }
 
+/*
+ * match tables used by mpc52xx_map_wdt()
+ */
+static struct of_device_id mpc52xx_gpt_ids[] __initdata = {
+       { .compatible = "fsl,mpc5200-gpt", },
+       { .compatible = "mpc5200-gpt", }, /* old */
+       {}
+};
+
 void __init
 mpc52xx_map_wdt(void)
 {
-       const void *has_wdt;
        struct device_node *np;
-
        /* mpc52xx_wdt is mapped here and used in mpc52xx_restart,
         * possibly from a interrupt context. wdt is only implement
         * on a gpt0, so check has-wdt property before mapping.
         */
-       for_each_compatible_node(np, NULL, "fsl,mpc5200-gpt") {
-               has_wdt = of_get_property(np, "fsl,has-wdt", NULL);
-               if (has_wdt) {
+       for_each_matching_node(np, mpc52xx_gpt_ids) {
+               if (of_get_property(np, "fsl,has-wdt", NULL) ||
+                   of_get_property(np, "has-wdt", NULL)) {
                        mpc52xx_wdt = of_iomap(np, 0);
                        of_node_put(np);
                        return;
                }
        }
-       for_each_compatible_node(np, NULL, "mpc5200-gpt") {
-               has_wdt = of_get_property(np, "has-wdt", NULL);
-               if (has_wdt) {
-                       mpc52xx_wdt = of_iomap(np, 0);
-                       of_node_put(np);
-                       return;
-               }
-
-       }
 }
 
 void

diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
index 4b79398b2e406e6301750b9987f180fc0b90d0eb..e3428ddd9040df88e77380775a0f9cc688fb7824 100644 (file)
--- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
@@ -99,6 +99,12 @@ struct mpc52xx_pci {
        u8      reserved6[4];   /* PCI + 0xFC */
 };
 
+/* MPC5200 device tree match tables */
+const struct of_device_id mpc52xx_pci_ids[] __initdata = {
+       { .type = "pci", .compatible = "fsl,mpc5200-pci", },
+       { .type = "pci", .compatible = "mpc5200-pci", },
+       {}
+};
 
 /* ======================================================================== */
 /* PCI configuration acess                                                  */
@@ -411,9 +417,7 @@ void __init mpc52xx_setup_pci(void)
 {
        struct device_node *pci;
 
-       pci = of_find_compatible_node(NULL, NULL, "fsl,mpc5200-pci");
-       if (!pci)
-               pci = of_find_compatible_node(NULL, NULL, "mpc5200-pci");
+       pci = of_find_matching_node(NULL, mpc52xx_pci_ids);
        if (!pci)
                return;
 

diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
index 07e89876d5829f281a4263041450b0339c8e9d2d..d0dead8b9a959b286cedf758b6761062a276e52f 100644 (file)
--- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
@@ -29,6 +29,18 @@
  *
 */
 
+/* MPC5200 device tree match tables */
+static struct of_device_id mpc52xx_pic_ids[] __initdata = {
+       { .compatible = "fsl,mpc5200-pic", },
+       { .compatible = "mpc5200-pic", },
+       {}
+};
+static struct of_device_id mpc52xx_sdma_ids[] __initdata = {
+       { .compatible = "fsl,mpc5200-bestcomm", },
+       { .compatible = "mpc5200-bestcomm", },
+       {}
+};
+
 static struct mpc52xx_intr __iomem *intr;
 static struct mpc52xx_sdma __iomem *sdma;
 static struct irq_host *mpc52xx_irqhost = NULL;
@@ -367,13 +379,13 @@ void __init mpc52xx_init_irq(void)
        struct device_node *np;
 
        /* Remap the necessary zones */
-       picnode = of_find_compatible_node(NULL, NULL, "mpc5200-pic");
+       picnode = of_find_matching_node(NULL, mpc52xx_pic_ids);
        intr = of_iomap(picnode, 0);
        if (!intr)
                panic(__FILE__  ": find_and_map failed on 'mpc5200-pic'. "
                                "Check node !");
 
-       np = of_find_compatible_node(NULL, NULL, "mpc5200-bestcomm");
+       np = of_find_matching_node(NULL, mpc52xx_sdma_ids);
        sdma = of_iomap(np, 0);
        of_node_put(np);
        if (!sdma)

diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pm.c b/arch/powerpc/platforms/52xx/mpc52xx_pm.c
index 52f027789c8f96e3070ef1aaf6ecb215c04088a9..c72d3304387ffb8ca692f91d369cc32014105089 100644 (file)
--- a/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pm.c
@@ -60,9 +60,16 @@ int mpc52xx_set_wakeup_gpio(u8 pin, u8 level)
 int mpc52xx_pm_prepare(void)
 {
        struct device_node *np;
+       const struct of_device_id immr_ids[] = {
+               { .compatible = "fsl,mpc5200-immr", },
+               { .compatible = "fsl,mpc5200b-immr", },
+               { .type = "soc", .compatible = "mpc5200", }, /* lite5200 */
+               { .type = "builtin", .compatible = "mpc5200", }, /* efika */
+               {}
+       };
 
        /* map the whole register space */
-       np = of_find_compatible_node(NULL, NULL, "mpc5200");
+       np = of_find_matching_node(NULL, immr_ids);
        mbar = of_iomap(np, 0);
        of_node_put(np);
        if (!mbar) {

diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm.c b/arch/powerpc/sysdev/bestcomm/bestcomm.c
index 740ad73ce5cc4e3c58044053e7dcedecc844fd2e..f589999361e060958c145ac199eec85ae466f24a 100644 (file)
--- a/arch/powerpc/sysdev/bestcomm/bestcomm.c
+++ b/arch/powerpc/sysdev/bestcomm/bestcomm.c
@@ -29,11 +29,17 @@
 
 #define DRIVER_NAME "bestcomm-core"
 
+/* MPC5200 device tree match tables */
+static struct of_device_id mpc52xx_sram_ids[] __devinitdata = {
+       { .compatible = "fsl,mpc5200-sram", },
+       { .compatible = "mpc5200-sram", },
+       {}
+};
+
 
 struct bcom_engine *bcom_eng = NULL;
 EXPORT_SYMBOL_GPL(bcom_eng);   /* needed for inline functions */
 
-
 /* ======================================================================== */
 /* Public and private API                                                   */
 /* ======================================================================== */
@@ -373,7 +379,7 @@ mpc52xx_bcom_probe(struct of_device *op, const struct of_device_id *match)
        of_node_get(op->node);
 
        /* Prepare SRAM */
-       ofn_sram = of_find_compatible_node(NULL, "sram", "mpc5200-sram");
+       ofn_sram = of_find_matching_node(NULL, mpc52xx_sram_ids);
        if (!ofn_sram) {
                printk(KERN_ERR DRIVER_NAME ": "
                        "No SRAM found in device tree\n");
@@ -478,10 +484,8 @@ mpc52xx_bcom_remove(struct of_device *op)
 }
 
 static struct of_device_id mpc52xx_bcom_of_match[] = {
-       {
-               .type           = "dma-controller",
-               .compatible     = "mpc5200-bestcomm",
-       },
+       { .type = "dma-controller", .compatible = "fsl,mpc5200-bestcomm", },
+       { .type = "dma-controller", .compatible = "mpc5200-bestcomm", },
        {},
 };
 

diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index 50c56e2814c1e0c6a777ed7ef80534d8e9012d73..1a7ca37168b285e4e4648aa7c782d441ce43a26e 100644 (file)
--- 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 f91ee700e605c051990afb27d350ac38c296b6ff..58b71e60204e6df0b505980c2205814141d5a171 100644 (file)
--- 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 ba6e8b218e0ae0ad3472fe1376acd2d049696b76..1837584c4504dd82f56db27d9326d9763b3ffe83 100644 (file)
--- 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 1e3721a0eef74045e5e5a26b62728766d2dafc8c..3c4d29e59b2c58581d1b380e95fabff4f5e9a6df 100644 (file)
--- 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 d398c93195e6c8cf17f9d3c607f48cd7db090fd7..a3ebc632a4778be095885521c596e09be87e5f74 100644 (file)
--- 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 0c3e6b790b7b8e1372005940389d648affd69392..a6725279122315bf7566b255164d29c7f8130bbd 100644 (file)
--- 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;
        }