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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Mark A. Greer and committed by

Paul Mackerras 18 years ago a1810b44 fb9d93de

+34 -34

7 changed files

expand all

arch

powerpc

boot

dts

prpmc2800.dts

serial.c

platforms

embedded6xx

prpmc2800.c

sysdev

mv64x60_dev.c

mv64x60_pci.c

mv64x60_pic.c

mv64x60_udbg.c

+20 -20

arch/powerpc/boot/dts/prpmc2800.dts

··· 46 46 #address-cells = <1>; 47 47 #size-cells = <1>; 48 48 model = "mv64360"; /* Default */ 49 - compatible = "marvell,mv64x60"; 49 + compatible = "marvell,mv64360"; 50 50 clock-frequency = <133333333>; 51 51 reg = <0xf1000000 0x10000>; 52 52 virtual-reg = <0xf1000000>; ··· 74 74 #address-cells = <1>; 75 75 #size-cells = <0>; 76 76 device_type = "mdio"; 77 - compatible = "marvell,mv64x60-mdio"; 77 + compatible = "marvell,mv64360-mdio"; 78 78 PHY0: ethernet-phy@1 { 79 79 device_type = "ethernet-phy"; 80 80 compatible = "broadcom,bcm5421"; ··· 95 95 reg = <0x2000 0x2000>; 96 96 eth0 { 97 97 device_type = "network"; 98 - compatible = "marvell,mv64x60-eth"; 98 + compatible = "marvell,mv64360-eth"; 99 99 block-index = <0>; 100 100 interrupts = <32>; 101 101 interrupt-parent = <&PIC>; ··· 104 104 }; 105 105 eth1 { 106 106 device_type = "network"; 107 - compatible = "marvell,mv64x60-eth"; 107 + compatible = "marvell,mv64360-eth"; 108 108 block-index = <1>; 109 109 interrupts = <33>; 110 110 interrupt-parent = <&PIC>; ··· 115 115 116 116 SDMA0: sdma@4000 { 117 117 device_type = "dma"; 118 - compatible = "marvell,mv64x60-sdma"; 118 + compatible = "marvell,mv64360-sdma"; 119 119 reg = <0x4000 0xc18>; 120 120 virtual-reg = <0xf1004000>; 121 121 interrupt-base = <0>; ··· 125 125 126 126 SDMA1: sdma@6000 { 127 127 device_type = "dma"; 128 - compatible = "marvell,mv64x60-sdma"; 128 + compatible = "marvell,mv64360-sdma"; 129 129 reg = <0x6000 0xc18>; 130 130 virtual-reg = <0xf1006000>; 131 131 interrupt-base = <0>; ··· 134 134 }; 135 135 136 136 BRG0: brg@b200 { 137 - compatible = "marvell,mv64x60-brg"; 137 + compatible = "marvell,mv64360-brg"; 138 138 reg = <0xb200 0x8>; 139 139 clock-src = <8>; 140 140 clock-frequency = <133333333>; ··· 143 143 }; 144 144 145 145 BRG1: brg@b208 { 146 - compatible = "marvell,mv64x60-brg"; 146 + compatible = "marvell,mv64360-brg"; 147 147 reg = <0xb208 0x8>; 148 148 clock-src = <8>; 149 149 clock-frequency = <133333333>; ··· 166 166 167 167 MPSC0: mpsc@8000 { 168 168 device_type = "serial"; 169 - compatible = "marvell,mpsc"; 169 + compatible = "marvell,mv64360-mpsc"; 170 170 reg = <0x8000 0x38>; 171 171 virtual-reg = <0xf1008000>; 172 172 sdma = <&SDMA0>; ··· 186 186 187 187 MPSC1: mpsc@9000 { 188 188 device_type = "serial"; 189 - compatible = "marvell,mpsc"; 189 + compatible = "marvell,mv64360-mpsc"; 190 190 reg = <0x9000 0x38>; 191 191 virtual-reg = <0xf1009000>; 192 192 sdma = <&SDMA1>; ··· 205 205 }; 206 206 207 207 wdt@b410 { /* watchdog timer */ 208 - compatible = "marvell,mv64x60-wdt"; 208 + compatible = "marvell,mv64360-wdt"; 209 209 reg = <0xb410 0x8>; 210 210 timeout = <10>; /* wdt timeout in seconds */ 211 211 }; 212 212 213 213 i2c@c000 { 214 214 device_type = "i2c"; 215 - compatible = "marvell,mv64x60-i2c"; 215 + compatible = "marvell,mv64360-i2c"; 216 216 reg = <0xc000 0x20>; 217 217 virtual-reg = <0xf100c000>; 218 218 freq_m = <8>; ··· 226 226 PIC: pic { 227 227 #interrupt-cells = <1>; 228 228 #address-cells = <0>; 229 - compatible = "marvell,mv64x60-pic"; 229 + compatible = "marvell,mv64360-pic"; 230 230 reg = <0x0 0x88>; 231 231 interrupt-controller; 232 232 }; 233 233 234 234 mpp@f000 { 235 - compatible = "marvell,mv64x60-mpp"; 235 + compatible = "marvell,mv64360-mpp"; 236 236 reg = <0xf000 0x10>; 237 237 }; 238 238 239 239 gpp@f100 { 240 - compatible = "marvell,mv64x60-gpp"; 240 + compatible = "marvell,mv64360-gpp"; 241 241 reg = <0xf100 0x20>; 242 242 }; 243 243 ··· 246 246 #size-cells = <2>; 247 247 #interrupt-cells = <1>; 248 248 device_type = "pci"; 249 - compatible = "marvell,mv64x60-pci"; 249 + compatible = "marvell,mv64360-pci"; 250 250 reg = <0xcf8 0x8>; 251 251 ranges = <0x01000000 0x0 0x0 252 252 0x88000000 0x0 0x01000000 ··· 285 285 }; 286 286 287 287 cpu-error@0070 { 288 - compatible = "marvell,mv64x60-cpu-error"; 288 + compatible = "marvell,mv64360-cpu-error"; 289 289 reg = <0x70 0x10 0x128 0x28>; 290 290 interrupts = <3>; 291 291 interrupt-parent = <&PIC>; 292 292 }; 293 293 294 294 sram-ctrl@0380 { 295 - compatible = "marvell,mv64x60-sram-ctrl"; 295 + compatible = "marvell,mv64360-sram-ctrl"; 296 296 reg = <0x380 0x80>; 297 297 interrupts = <13>; 298 298 interrupt-parent = <&PIC>; 299 299 }; 300 300 301 301 pci-error@1d40 { 302 - compatible = "marvell,mv64x60-pci-error"; 302 + compatible = "marvell,mv64360-pci-error"; 303 303 reg = <0x1d40 0x40 0xc28 0x4>; 304 304 interrupts = <12>; 305 305 interrupt-parent = <&PIC>; 306 306 }; 307 307 308 308 mem-ctrl@1400 { 309 - compatible = "marvell,mv64x60-mem-ctrl"; 309 + compatible = "marvell,mv64360-mem-ctrl"; 310 310 reg = <0x1400 0x60>; 311 311 interrupts = <17>; 312 312 interrupt-parent = <&PIC>;

+1 -1

arch/powerpc/boot/serial.c

··· 119 119 120 120 if (dt_is_compatible(devp, "ns16550")) 121 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 123 rc = mpsc_console_init(devp, &serial_cd); 124 124 else if (dt_is_compatible(devp, "fsl,cpm1-scc-uart") || 125 125 dt_is_compatible(devp, "fsl,cpm1-smc-uart") ||

+2 -2

arch/powerpc/platforms/embedded6xx/prpmc2800.c

··· 49 49 * ioremap mpp and gpp registers in case they are later 50 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 53 reg = of_get_property(np, "reg", NULL); 54 54 paddr = of_translate_address(np, reg); 55 55 of_node_put(np); 56 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 59 reg = of_get_property(np, "reg", NULL); 60 60 paddr = of_translate_address(np, reg); 61 61 of_node_put(np);

+5 -5

arch/powerpc/sysdev/mv64x60_dev.c

··· 446 446 int err; 447 447 448 448 id = 0; 449 - for_each_compatible_node(np, "serial", "marvell,mpsc") 449 + for_each_compatible_node(np, "serial", "marvell,mv64360-mpsc") 450 450 if ((err = mv64x60_mpsc_device_setup(np, id++))) 451 451 goto error; 452 452 453 453 id = 0; 454 - for_each_compatible_node(np, "network", "marvell,mv64x60-eth") 454 + for_each_compatible_node(np, "network", "marvell,mv64360-eth") 455 455 if ((err = mv64x60_eth_device_setup(np, id++))) 456 456 goto error; 457 457 458 458 id = 0; 459 - for_each_compatible_node(np, "i2c", "marvell,mv64x60-i2c") 459 + for_each_compatible_node(np, "i2c", "marvell,mv64360-i2c") 460 460 if ((err = mv64x60_i2c_device_setup(np, id++))) 461 461 goto error; 462 462 463 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 465 if (np) { 466 466 if ((err = mv64x60_wdt_device_setup(np, id))) 467 467 goto error; ··· 489 489 if (!np) 490 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 493 goto not_mpsc; 494 494 495 495 prop = of_get_property(np, "block-index", NULL);

+3 -3

arch/powerpc/sysdev/mv64x60_pci.c

··· 86 86 struct platform_device *pdev; 87 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 90 if (!np) 91 91 return 0; 92 92 93 93 prop = of_get_property(np, "hs_reg_valid", NULL); 94 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 97 if (IS_ERR(pdev)) 98 98 return PTR_ERR(pdev); 99 99 ··· 166 166 { 167 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 170 mv64x60_add_bridge(np); 171 171 }

+2 -2

arch/powerpc/sysdev/mv64x60_pic.c

··· 238 238 const unsigned int *reg; 239 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 242 reg = of_get_property(np, "reg", &size); 243 243 paddr = of_translate_address(np, reg); 244 244 mv64x60_gpp_reg_base = ioremap(paddr, reg[1]); 245 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 248 reg = of_get_property(np, "reg", &size); 249 249 paddr = of_translate_address(np, reg); 250 250 mv64x60_irq_reg_base = ioremap(paddr, reg[1]);

+1 -1

arch/powerpc/sysdev/mv64x60_udbg.c

··· 85 85 if (!stdout) 86 86 return; 87 87 88 - for_each_compatible_node(np, "serial", "marvell,mpsc") { 88 + for_each_compatible_node(np, "serial", "marvell,mv64360-mpsc") { 89 89 if (np == stdout) 90 90 break; 91 91 }