[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>

6 files changed, 87 insertions, 35 deletions

diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c
index 5a8d190f53e4..fb35b285a146 100644
--- 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 c3ada1e340d2..c0f13e8deb0b 100644
--- 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 66955937be2a..744eb3a34ec9 100644
--- 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 4b79398b2e40..e3428ddd9040 100644
--- 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 07e89876d582..d0dead8b9a95 100644
--- 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 52f027789c8f..c72d3304387f 100644
--- 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) {