diff options
-rw-r--r-- | arch/powerpc/platforms/82xx/mpc8272_ads.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/powerpc/platforms/82xx/mpc8272_ads.c b/arch/powerpc/platforms/82xx/mpc8272_ads.c index 5f538d5e7fdb..4de76dad31b2 100644 --- a/arch/powerpc/platforms/82xx/mpc8272_ads.c +++ b/arch/powerpc/platforms/82xx/mpc8272_ads.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * MPC82xx_ads setup and early boot code plus other random bits. | 2 | * MPC8272_ads setup and early boot code plus other random bits. |
3 | * | 3 | * |
4 | * Author: Vitaly Bordug <vbordug@ru.mvista.com> | 4 | * Author: Vitaly Bordug <vbordug@ru.mvista.com> |
5 | * m82xx_restart fix by Wade Farnsworth <wfarnsworth@mvista.com> | 5 | * m82xx_restart fix by Wade Farnsworth <wfarnsworth@mvista.com> |
@@ -63,7 +63,7 @@ static unsigned long pci_int_base; | |||
63 | static struct irq_host *pci_pic_host; | 63 | static struct irq_host *pci_pic_host; |
64 | #endif | 64 | #endif |
65 | 65 | ||
66 | static void __init mpc82xx_ads_pic_init(void) | 66 | static void __init mpc8272_ads_pic_init(void) |
67 | { | 67 | { |
68 | struct device_node *np = of_find_compatible_node(NULL, "cpm-pic", "CPM2"); | 68 | struct device_node *np = of_find_compatible_node(NULL, "cpm-pic", "CPM2"); |
69 | struct resource r; | 69 | struct resource r; |
@@ -553,14 +553,14 @@ static void __init mpc82xx_add_bridge(struct device_node *np) | |||
553 | /* | 553 | /* |
554 | * Setup the architecture | 554 | * Setup the architecture |
555 | */ | 555 | */ |
556 | static void __init mpc82xx_ads_setup_arch(void) | 556 | static void __init mpc8272_ads_setup_arch(void) |
557 | { | 557 | { |
558 | #ifdef CONFIG_PCI | 558 | #ifdef CONFIG_PCI |
559 | struct device_node *np; | 559 | struct device_node *np; |
560 | #endif | 560 | #endif |
561 | 561 | ||
562 | if (ppc_md.progress) | 562 | if (ppc_md.progress) |
563 | ppc_md.progress("mpc82xx_ads_setup_arch()", 0); | 563 | ppc_md.progress("mpc8272_ads_setup_arch()", 0); |
564 | cpm2_reset(); | 564 | cpm2_reset(); |
565 | 565 | ||
566 | /* Map I/O region to a 256MB BAT */ | 566 | /* Map I/O region to a 256MB BAT */ |
@@ -582,13 +582,13 @@ static void __init mpc82xx_ads_setup_arch(void) | |||
582 | #endif | 582 | #endif |
583 | 583 | ||
584 | if (ppc_md.progress) | 584 | if (ppc_md.progress) |
585 | ppc_md.progress("mpc82xx_ads_setup_arch(), finish", 0); | 585 | ppc_md.progress("mpc8272_ads_setup_arch(), finish", 0); |
586 | } | 586 | } |
587 | 587 | ||
588 | /* | 588 | /* |
589 | * Called very early, device-tree isn't unflattened | 589 | * Called very early, device-tree isn't unflattened |
590 | */ | 590 | */ |
591 | static int __init mpc82xx_ads_probe(void) | 591 | static int __init mpc8272_ads_probe(void) |
592 | { | 592 | { |
593 | /* We always match for now, eventually we should look at | 593 | /* We always match for now, eventually we should look at |
594 | * the flat dev tree to ensure this is the board we are | 594 | * the flat dev tree to ensure this is the board we are |
@@ -612,13 +612,13 @@ static void m82xx_restart(char *cmd) | |||
612 | while (1) ; | 612 | while (1) ; |
613 | } | 613 | } |
614 | 614 | ||
615 | define_machine(mpc82xx_ads) | 615 | define_machine(mpc8272_ads) |
616 | { | 616 | { |
617 | .name = "MPC82xx ADS", | 617 | .name = "MPC8272 ADS", |
618 | .probe = mpc82xx_ads_probe, | 618 | .probe = mpc8272_ads_probe, |
619 | .setup_arch = mpc82xx_ads_setup_arch, | 619 | .setup_arch = mpc8272_ads_setup_arch, |
620 | .init_IRQ = mpc82xx_ads_pic_init, | 620 | .init_IRQ = mpc8272_ads_pic_init, |
621 | .get_irq = cpm2_get_irq, | 621 | .get_irq = cpm2_get_irq, |
622 | .calibrate_decr = generic_calibrate_decr, | 622 | .calibrate_decr = generic_calibrate_decr, |
623 | .restart = m82xx_restart, | 623 | .restart = m82xx_restart, |
624 | }; | 624 | }; |