aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorMark A. Greer <mgreer@mvista.com>2008-04-07 18:09:03 -0400
committerPaul Mackerras <paulus@samba.org>2008-04-15 07:21:24 -0400
commita1810b44c2d52392cd63e17fc208783cf6be6215 (patch)
treeb2484650448a41aaf16664933b928f8c74fc8edd /arch/powerpc
parentfb9d93de6049922c4d46cc2dc9d2eeec07369e7f (diff)
[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>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/boot/dts/prpmc2800.dts40
-rw-r--r--arch/powerpc/boot/serial.c2
-rw-r--r--arch/powerpc/platforms/embedded6xx/prpmc2800.c4
-rw-r--r--arch/powerpc/sysdev/mv64x60_dev.c10
-rw-r--r--arch/powerpc/sysdev/mv64x60_pci.c6
-rw-r--r--arch/powerpc/sysdev/mv64x60_pic.c4
-rw-r--r--arch/powerpc/sysdev/mv64x60_udbg.c2
7 files changed, 34 insertions, 34 deletions
diff --git a/arch/powerpc/boot/dts/prpmc2800.dts b/arch/powerpc/boot/dts/prpmc2800.dts
index 822aac7e5bb..cb26b007980 100644
--- a/arch/powerpc/boot/dts/prpmc2800.dts
+++ b/arch/powerpc/boot/dts/prpmc2800.dts
@@ -46,7 +46,7 @@
46 #address-cells = <1>; 46 #address-cells = <1>;
47 #size-cells = <1>; 47 #size-cells = <1>;
48 model = "mv64360"; /* Default */ 48 model = "mv64360"; /* Default */
49 compatible = "marvell,mv64x60"; 49 compatible = "marvell,mv64360";
50 clock-frequency = <133333333>; 50 clock-frequency = <133333333>;
51 reg = <0xf1000000 0x10000>; 51 reg = <0xf1000000 0x10000>;
52 virtual-reg = <0xf1000000>; 52 virtual-reg = <0xf1000000>;
@@ -74,7 +74,7 @@
74 #address-cells = <1>; 74 #address-cells = <1>;
75 #size-cells = <0>; 75 #size-cells = <0>;
76 device_type = "mdio"; 76 device_type = "mdio";
77 compatible = "marvell,mv64x60-mdio"; 77 compatible = "marvell,mv64360-mdio";
78 PHY0: ethernet-phy@1 { 78 PHY0: ethernet-phy@1 {
79 device_type = "ethernet-phy"; 79 device_type = "ethernet-phy";
80 compatible = "broadcom,bcm5421"; 80 compatible = "broadcom,bcm5421";
@@ -95,7 +95,7 @@
95 reg = <0x2000 0x2000>; 95 reg = <0x2000 0x2000>;
96 eth0 { 96 eth0 {
97 device_type = "network"; 97 device_type = "network";
98 compatible = "marvell,mv64x60-eth"; 98 compatible = "marvell,mv64360-eth";
99 block-index = <0>; 99 block-index = <0>;
100 interrupts = <32>; 100 interrupts = <32>;
101 interrupt-parent = <&PIC>; 101 interrupt-parent = <&PIC>;
@@ -104,7 +104,7 @@
104 }; 104 };
105 eth1 { 105 eth1 {
106 device_type = "network"; 106 device_type = "network";
107 compatible = "marvell,mv64x60-eth"; 107 compatible = "marvell,mv64360-eth";
108 block-index = <1>; 108 block-index = <1>;
109 interrupts = <33>; 109 interrupts = <33>;
110 interrupt-parent = <&PIC>; 110 interrupt-parent = <&PIC>;
@@ -115,7 +115,7 @@
115 115
116 SDMA0: sdma@4000 { 116 SDMA0: sdma@4000 {
117 device_type = "dma"; 117 device_type = "dma";
118 compatible = "marvell,mv64x60-sdma"; 118 compatible = "marvell,mv64360-sdma";
119 reg = <0x4000 0xc18>; 119 reg = <0x4000 0xc18>;
120 virtual-reg = <0xf1004000>; 120 virtual-reg = <0xf1004000>;
121 interrupt-base = <0>; 121 interrupt-base = <0>;
@@ -125,7 +125,7 @@
125 125
126 SDMA1: sdma@6000 { 126 SDMA1: sdma@6000 {
127 device_type = "dma"; 127 device_type = "dma";
128 compatible = "marvell,mv64x60-sdma"; 128 compatible = "marvell,mv64360-sdma";
129 reg = <0x6000 0xc18>; 129 reg = <0x6000 0xc18>;
130 virtual-reg = <0xf1006000>; 130 virtual-reg = <0xf1006000>;
131 interrupt-base = <0>; 131 interrupt-base = <0>;
@@ -134,7 +134,7 @@
134 }; 134 };
135 135
136 BRG0: brg@b200 { 136 BRG0: brg@b200 {
137 compatible = "marvell,mv64x60-brg"; 137 compatible = "marvell,mv64360-brg";
138 reg = <0xb200 0x8>; 138 reg = <0xb200 0x8>;
139 clock-src = <8>; 139 clock-src = <8>;
140 clock-frequency = <133333333>; 140 clock-frequency = <133333333>;
@@ -143,7 +143,7 @@
143 }; 143 };
144 144
145 BRG1: brg@b208 { 145 BRG1: brg@b208 {
146 compatible = "marvell,mv64x60-brg"; 146 compatible = "marvell,mv64360-brg";
147 reg = <0xb208 0x8>; 147 reg = <0xb208 0x8>;
148 clock-src = <8>; 148 clock-src = <8>;
149 clock-frequency = <133333333>; 149 clock-frequency = <133333333>;
@@ -166,7 +166,7 @@
166 166
167 MPSC0: mpsc@8000 { 167 MPSC0: mpsc@8000 {
168 device_type = "serial"; 168 device_type = "serial";
169 compatible = "marvell,mpsc"; 169 compatible = "marvell,mv64360-mpsc";
170 reg = <0x8000 0x38>; 170 reg = <0x8000 0x38>;
171 virtual-reg = <0xf1008000>; 171 virtual-reg = <0xf1008000>;
172 sdma = <&SDMA0>; 172 sdma = <&SDMA0>;
@@ -186,7 +186,7 @@
186 186
187 MPSC1: mpsc@9000 { 187 MPSC1: mpsc@9000 {
188 device_type = "serial"; 188 device_type = "serial";
189 compatible = "marvell,mpsc"; 189 compatible = "marvell,mv64360-mpsc";
190 reg = <0x9000 0x38>; 190 reg = <0x9000 0x38>;
191 virtual-reg = <0xf1009000>; 191 virtual-reg = <0xf1009000>;
192 sdma = <&SDMA1>; 192 sdma = <&SDMA1>;
@@ -205,14 +205,14 @@
205 }; 205 };
206 206
207 wdt@b410 { /* watchdog timer */ 207 wdt@b410 { /* watchdog timer */
208 compatible = "marvell,mv64x60-wdt"; 208 compatible = "marvell,mv64360-wdt";
209 reg = <0xb410 0x8>; 209 reg = <0xb410 0x8>;
210 timeout = <10>; /* wdt timeout in seconds */ 210 timeout = <10>; /* wdt timeout in seconds */
211 }; 211 };
212 212
213 i2c@c000 { 213 i2c@c000 {
214 device_type = "i2c"; 214 device_type = "i2c";
215 compatible = "marvell,mv64x60-i2c"; 215 compatible = "marvell,mv64360-i2c";
216 reg = <0xc000 0x20>; 216 reg = <0xc000 0x20>;
217 virtual-reg = <0xf100c000>; 217 virtual-reg = <0xf100c000>;
218 freq_m = <8>; 218 freq_m = <8>;
@@ -226,18 +226,18 @@
226 PIC: pic { 226 PIC: pic {
227 #interrupt-cells = <1>; 227 #interrupt-cells = <1>;
228 #address-cells = <0>; 228 #address-cells = <0>;
229 compatible = "marvell,mv64x60-pic"; 229 compatible = "marvell,mv64360-pic";
230 reg = <0x0 0x88>; 230 reg = <0x0 0x88>;
231 interrupt-controller; 231 interrupt-controller;
232 }; 232 };
233 233
234 mpp@f000 { 234 mpp@f000 {
235 compatible = "marvell,mv64x60-mpp"; 235 compatible = "marvell,mv64360-mpp";
236 reg = <0xf000 0x10>; 236 reg = <0xf000 0x10>;
237 }; 237 };
238 238
239 gpp@f100 { 239 gpp@f100 {
240 compatible = "marvell,mv64x60-gpp"; 240 compatible = "marvell,mv64360-gpp";
241 reg = <0xf100 0x20>; 241 reg = <0xf100 0x20>;
242 }; 242 };
243 243
@@ -246,7 +246,7 @@
246 #size-cells = <2>; 246 #size-cells = <2>;
247 #interrupt-cells = <1>; 247 #interrupt-cells = <1>;
248 device_type = "pci"; 248 device_type = "pci";
249 compatible = "marvell,mv64x60-pci"; 249 compatible = "marvell,mv64360-pci";
250 reg = <0xcf8 0x8>; 250 reg = <0xcf8 0x8>;
251 ranges = <0x01000000 0x0 0x0 251 ranges = <0x01000000 0x0 0x0
252 0x88000000 0x0 0x01000000 252 0x88000000 0x0 0x01000000
@@ -285,28 +285,28 @@
285 }; 285 };
286 286
287 cpu-error@0070 { 287 cpu-error@0070 {
288 compatible = "marvell,mv64x60-cpu-error"; 288 compatible = "marvell,mv64360-cpu-error";
289 reg = <0x70 0x10 0x128 0x28>; 289 reg = <0x70 0x10 0x128 0x28>;
290 interrupts = <3>; 290 interrupts = <3>;
291 interrupt-parent = <&PIC>; 291 interrupt-parent = <&PIC>;
292 }; 292 };
293 293
294 sram-ctrl@0380 { 294 sram-ctrl@0380 {
295 compatible = "marvell,mv64x60-sram-ctrl"; 295 compatible = "marvell,mv64360-sram-ctrl";
296 reg = <0x380 0x80>; 296 reg = <0x380 0x80>;
297 interrupts = <13>; 297 interrupts = <13>;
298 interrupt-parent = <&PIC>; 298 interrupt-parent = <&PIC>;
299 }; 299 };
300 300
301 pci-error@1d40 { 301 pci-error@1d40 {
302 compatible = "marvell,mv64x60-pci-error"; 302 compatible = "marvell,mv64360-pci-error";
303 reg = <0x1d40 0x40 0xc28 0x4>; 303 reg = <0x1d40 0x40 0xc28 0x4>;
304 interrupts = <12>; 304 interrupts = <12>;
305 interrupt-parent = <&PIC>; 305 interrupt-parent = <&PIC>;
306 }; 306 };
307 307
308 mem-ctrl@1400 { 308 mem-ctrl@1400 {
309 compatible = "marvell,mv64x60-mem-ctrl"; 309 compatible = "marvell,mv64360-mem-ctrl";
310 reg = <0x1400 0x60>; 310 reg = <0x1400 0x60>;
311 interrupts = <17>; 311 interrupts = <17>;
312 interrupt-parent = <&PIC>; 312 interrupt-parent = <&PIC>;
diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c
index 9960421eb6b..8b3607cb53f 100644
--- a/arch/powerpc/boot/serial.c
+++ b/arch/powerpc/boot/serial.c
@@ -119,7 +119,7 @@ int serial_console_init(void)
119 119
120 if (dt_is_compatible(devp, "ns16550")) 120 if (dt_is_compatible(devp, "ns16550"))
121 rc = ns16550_console_init(devp, &serial_cd); 121 rc = ns16550_console_init(devp, &serial_cd);
122 else if (dt_is_compatible(devp, "marvell,mpsc")) 122 else if (dt_is_compatible(devp, "marvell,mv64360-mpsc"))
123 rc = mpsc_console_init(devp, &serial_cd); 123 rc = mpsc_console_init(devp, &serial_cd);
124 else if (dt_is_compatible(devp, "fsl,cpm1-scc-uart") || 124 else if (dt_is_compatible(devp, "fsl,cpm1-scc-uart") ||
125 dt_is_compatible(devp, "fsl,cpm1-smc-uart") || 125 dt_is_compatible(devp, "fsl,cpm1-smc-uart") ||
diff --git a/arch/powerpc/platforms/embedded6xx/prpmc2800.c b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
index 653a5eb91c9..5a19b9a1457 100644
--- a/arch/powerpc/platforms/embedded6xx/prpmc2800.c
+++ b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
@@ -49,13 +49,13 @@ static void __init prpmc2800_setup_arch(void)
49 * ioremap mpp and gpp registers in case they are later 49 * ioremap mpp and gpp registers in case they are later
50 * needed by prpmc2800_reset_board(). 50 * needed by prpmc2800_reset_board().
51 */ 51 */
52 np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-mpp"); 52 np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-mpp");
53 reg = of_get_property(np, "reg", NULL); 53 reg = of_get_property(np, "reg", NULL);
54 paddr = of_translate_address(np, reg); 54 paddr = of_translate_address(np, reg);
55 of_node_put(np); 55 of_node_put(np);
56 mv64x60_mpp_reg_base = ioremap(paddr, reg[1]); 56 mv64x60_mpp_reg_base = ioremap(paddr, reg[1]);
57 57
58 np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-gpp"); 58 np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-gpp");
59 reg = of_get_property(np, "reg", NULL); 59 reg = of_get_property(np, "reg", NULL);
60 paddr = of_translate_address(np, reg); 60 paddr = of_translate_address(np, reg);
61 of_node_put(np); 61 of_node_put(np);
diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c
index efda0028909..d9626eea1c7 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)
446 int err; 446 int err;
447 447
448 id = 0; 448 id = 0;
449 for_each_compatible_node(np, "serial", "marvell,mpsc") 449 for_each_compatible_node(np, "serial", "marvell,mv64360-mpsc")
450 if ((err = mv64x60_mpsc_device_setup(np, id++))) 450 if ((err = mv64x60_mpsc_device_setup(np, id++)))
451 goto error; 451 goto error;
452 452
453 id = 0; 453 id = 0;
454 for_each_compatible_node(np, "network", "marvell,mv64x60-eth") 454 for_each_compatible_node(np, "network", "marvell,mv64360-eth")
455 if ((err = mv64x60_eth_device_setup(np, id++))) 455 if ((err = mv64x60_eth_device_setup(np, id++)))
456 goto error; 456 goto error;
457 457
458 id = 0; 458 id = 0;
459 for_each_compatible_node(np, "i2c", "marvell,mv64x60-i2c") 459 for_each_compatible_node(np, "i2c", "marvell,mv64360-i2c")
460 if ((err = mv64x60_i2c_device_setup(np, id++))) 460 if ((err = mv64x60_i2c_device_setup(np, id++)))
461 goto error; 461 goto error;
462 462
463 /* support up to one watchdog timer */ 463 /* support up to one watchdog timer */
464 np = of_find_compatible_node(np, NULL, "marvell,mv64x60-wdt"); 464 np = of_find_compatible_node(np, NULL, "marvell,mv64360-wdt");
465 if (np) { 465 if (np) {
466 if ((err = mv64x60_wdt_device_setup(np, id))) 466 if ((err = mv64x60_wdt_device_setup(np, id)))
467 goto error; 467 goto error;
@@ -489,7 +489,7 @@ static int __init mv64x60_add_mpsc_console(void)
489 if (!np) 489 if (!np)
490 goto not_mpsc; 490 goto not_mpsc;
491 491
492 if (!of_device_is_compatible(np, "marvell,mpsc")) 492 if (!of_device_is_compatible(np, "marvell,mv64360-mpsc"))
493 goto not_mpsc; 493 goto not_mpsc;
494 494
495 prop = of_get_property(np, "block-index", NULL); 495 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 d21ab8fa499..1456015a22d 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)
86 struct platform_device *pdev; 86 struct platform_device *pdev;
87 const unsigned int *prop; 87 const unsigned int *prop;
88 88
89 np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60"); 89 np = of_find_compatible_node(NULL, NULL, "marvell,mv64360");
90 if (!np) 90 if (!np)
91 return 0; 91 return 0;
92 92
93 prop = of_get_property(np, "hs_reg_valid", NULL); 93 prop = of_get_property(np, "hs_reg_valid", NULL);
94 of_node_put(np); 94 of_node_put(np);
95 95
96 pdev = platform_device_register_simple("marvell,mv64x60", 0, NULL, 0); 96 pdev = platform_device_register_simple("marvell,mv64360", 0, NULL, 0);
97 if (IS_ERR(pdev)) 97 if (IS_ERR(pdev))
98 return PTR_ERR(pdev); 98 return PTR_ERR(pdev);
99 99
@@ -166,6 +166,6 @@ void __init mv64x60_pci_init(void)
166{ 166{
167 struct device_node *np; 167 struct device_node *np;
168 168
169 for_each_compatible_node(np, "pci", "marvell,mv64x60-pci") 169 for_each_compatible_node(np, "pci", "marvell,mv64360-pci")
170 mv64x60_add_bridge(np); 170 mv64x60_add_bridge(np);
171} 171}
diff --git a/arch/powerpc/sysdev/mv64x60_pic.c b/arch/powerpc/sysdev/mv64x60_pic.c
index 19e6ef26379..2aa4ed066db 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)
238 const unsigned int *reg; 238 const unsigned int *reg;
239 unsigned long flags; 239 unsigned long flags;
240 240
241 np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-gpp"); 241 np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-gpp");
242 reg = of_get_property(np, "reg", &size); 242 reg = of_get_property(np, "reg", &size);
243 paddr = of_translate_address(np, reg); 243 paddr = of_translate_address(np, reg);
244 mv64x60_gpp_reg_base = ioremap(paddr, reg[1]); 244 mv64x60_gpp_reg_base = ioremap(paddr, reg[1]);
245 of_node_put(np); 245 of_node_put(np);
246 246
247 np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-pic"); 247 np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-pic");
248 reg = of_get_property(np, "reg", &size); 248 reg = of_get_property(np, "reg", &size);
249 paddr = of_translate_address(np, reg); 249 paddr = of_translate_address(np, reg);
250 mv64x60_irq_reg_base = ioremap(paddr, reg[1]); 250 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 35c77c7d061..ccdb3b0418f 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)
85 if (!stdout) 85 if (!stdout)
86 return; 86 return;
87 87
88 for_each_compatible_node(np, "serial", "marvell,mpsc") { 88 for_each_compatible_node(np, "serial", "marvell,mv64360-mpsc") {
89 if (np == stdout) 89 if (np == stdout)
90 break; 90 break;
91 } 91 }