aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/sysdev/mv64x60_dev.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/sysdev/mv64x60_dev.c')
-rw-r--r--arch/powerpc/sysdev/mv64x60_dev.c10
1 files changed, 5 insertions, 5 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)
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);