[POWERPC] mv64x60: Fix FDT compatible names: mv64x60 => mv64360

Compatible names should refer to a specific version of the hardware,
without wildcards.  Change each instance of mv64x60 to mv64360, which
is the oldest version we currently support.

Signed-off-by: Mark A. Greer <mgreer@mvista.com>
Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

4 files changed, 11 insertions, 11 deletions

diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c
index efda0028909d..d9626eea1c72 100644
--- a/arch/powerpc/sysdev/mv64x60_dev.c
+++ b/arch/powerpc/sysdev/mv64x60_dev.c
@@ -446,22 +446,22 @@ static int __init mv64x60_device_setup(void)
         int err;
 
         id = 0;
-        for_each_compatible_node(np, "serial", "marvell,mpsc")
+        for_each_compatible_node(np, "serial", "marvell,mv64360-mpsc")
                 if ((err = mv64x60_mpsc_device_setup(np, id++)))
                         goto error;
 
         id = 0;
-        for_each_compatible_node(np, "network", "marvell,mv64x60-eth")
+        for_each_compatible_node(np, "network", "marvell,mv64360-eth")
                 if ((err = mv64x60_eth_device_setup(np, id++)))
                         goto error;
 
         id = 0;
-        for_each_compatible_node(np, "i2c", "marvell,mv64x60-i2c")
+        for_each_compatible_node(np, "i2c", "marvell,mv64360-i2c")
                 if ((err = mv64x60_i2c_device_setup(np, id++)))
                         goto error;
 
         /* support up to one watchdog timer */
-        np = of_find_compatible_node(np, NULL, "marvell,mv64x60-wdt");
+        np = of_find_compatible_node(np, NULL, "marvell,mv64360-wdt");
         if (np) {
                 if ((err = mv64x60_wdt_device_setup(np, id)))
                         goto error;
@@ -489,7 +489,7 @@ static int __init mv64x60_add_mpsc_console(void)
         if (!np)
                 goto not_mpsc;
 
-        if (!of_device_is_compatible(np, "marvell,mpsc"))
+        if (!of_device_is_compatible(np, "marvell,mv64360-mpsc"))
                 goto not_mpsc;
 
         prop = of_get_property(np, "block-index", NULL);
diff --git a/arch/powerpc/sysdev/mv64x60_pci.c b/arch/powerpc/sysdev/mv64x60_pci.c
index d21ab8fa4993..1456015a22d8 100644
--- a/arch/powerpc/sysdev/mv64x60_pci.c
+++ b/arch/powerpc/sysdev/mv64x60_pci.c
@@ -86,14 +86,14 @@ static int __init mv64x60_sysfs_init(void)
         struct platform_device *pdev;
         const unsigned int *prop;
 
-        np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60");
+        np = of_find_compatible_node(NULL, NULL, "marvell,mv64360");
         if (!np)
                 return 0;
 
         prop = of_get_property(np, "hs_reg_valid", NULL);
         of_node_put(np);
 
-        pdev = platform_device_register_simple("marvell,mv64x60", 0, NULL, 0);
+        pdev = platform_device_register_simple("marvell,mv64360", 0, NULL, 0);
         if (IS_ERR(pdev))
                 return PTR_ERR(pdev);
 
@@ -166,6 +166,6 @@ void __init mv64x60_pci_init(void)
 {
         struct device_node *np;
 
-        for_each_compatible_node(np, "pci", "marvell,mv64x60-pci")
+        for_each_compatible_node(np, "pci", "marvell,mv64360-pci")
                 mv64x60_add_bridge(np);
 }
diff --git a/arch/powerpc/sysdev/mv64x60_pic.c b/arch/powerpc/sysdev/mv64x60_pic.c
index 19e6ef263797..2aa4ed066db1 100644
--- a/arch/powerpc/sysdev/mv64x60_pic.c
+++ b/arch/powerpc/sysdev/mv64x60_pic.c
@@ -238,13 +238,13 @@ void __init mv64x60_init_irq(void)
         const unsigned int *reg;
         unsigned long flags;
 
-        np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-gpp");
+        np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-gpp");
         reg = of_get_property(np, "reg", &size);
         paddr = of_translate_address(np, reg);
         mv64x60_gpp_reg_base = ioremap(paddr, reg[1]);
         of_node_put(np);
 
-        np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-pic");
+        np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-pic");
         reg = of_get_property(np, "reg", &size);
         paddr = of_translate_address(np, reg);
         mv64x60_irq_reg_base = ioremap(paddr, reg[1]);
diff --git a/arch/powerpc/sysdev/mv64x60_udbg.c b/arch/powerpc/sysdev/mv64x60_udbg.c
index 35c77c7d0616..ccdb3b0418fc 100644
--- a/arch/powerpc/sysdev/mv64x60_udbg.c
+++ b/arch/powerpc/sysdev/mv64x60_udbg.c
@@ -85,7 +85,7 @@ static void mv64x60_udbg_init(void)
         if (!stdout)
                 return;
 
-        for_each_compatible_node(np, "serial", "marvell,mpsc") {
+        for_each_compatible_node(np, "serial", "marvell,mv64360-mpsc") {
                 if (np == stdout)
                         break;
         }