diff options
Diffstat (limited to 'arch/powerpc/platforms/85xx')
-rw-r--r-- | arch/powerpc/platforms/85xx/Kconfig | 6 | ||||
-rw-r--r-- | arch/powerpc/platforms/85xx/Makefile | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/85xx/p2041_rdb.c (renamed from arch/powerpc/platforms/85xx/p2040_rdb.c) | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index 1b393f40c639..1e66edb95d20 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig | |||
@@ -171,8 +171,8 @@ config SBC8560 | |||
171 | help | 171 | help |
172 | This option enables support for the Wind River SBC8560 board | 172 | This option enables support for the Wind River SBC8560 board |
173 | 173 | ||
174 | config P2040_RDB | 174 | config P2041_RDB |
175 | bool "Freescale P2040 RDB" | 175 | bool "Freescale P2041 RDB" |
176 | select DEFAULT_UIMAGE | 176 | select DEFAULT_UIMAGE |
177 | select PPC_E500MC | 177 | select PPC_E500MC |
178 | select PHYS_64BIT | 178 | select PHYS_64BIT |
@@ -182,7 +182,7 @@ config P2040_RDB | |||
182 | select HAS_RAPIDIO | 182 | select HAS_RAPIDIO |
183 | select PPC_EPAPR_HV_PIC | 183 | select PPC_EPAPR_HV_PIC |
184 | help | 184 | help |
185 | This option enables support for the P2040 RDB board | 185 | This option enables support for the P2041 RDB board |
186 | 186 | ||
187 | config P3041_DS | 187 | config P3041_DS |
188 | bool "Freescale P3041 DS" | 188 | bool "Freescale P3041 DS" |
diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile index a971b32c5c0a..39e6c22f06fa 100644 --- a/arch/powerpc/platforms/85xx/Makefile +++ b/arch/powerpc/platforms/85xx/Makefile | |||
@@ -13,7 +13,7 @@ obj-$(CONFIG_MPC85xx_RDB) += mpc85xx_rdb.o | |||
13 | obj-$(CONFIG_P1010_RDB) += p1010rdb.o | 13 | obj-$(CONFIG_P1010_RDB) += p1010rdb.o |
14 | obj-$(CONFIG_P1022_DS) += p1022_ds.o | 14 | obj-$(CONFIG_P1022_DS) += p1022_ds.o |
15 | obj-$(CONFIG_P1023_RDS) += p1023_rds.o | 15 | obj-$(CONFIG_P1023_RDS) += p1023_rds.o |
16 | obj-$(CONFIG_P2040_RDB) += p2040_rdb.o corenet_ds.o | 16 | obj-$(CONFIG_P2041_RDB) += p2041_rdb.o corenet_ds.o |
17 | obj-$(CONFIG_P3041_DS) += p3041_ds.o corenet_ds.o | 17 | obj-$(CONFIG_P3041_DS) += p3041_ds.o corenet_ds.o |
18 | obj-$(CONFIG_P4080_DS) += p4080_ds.o corenet_ds.o | 18 | obj-$(CONFIG_P4080_DS) += p4080_ds.o corenet_ds.o |
19 | obj-$(CONFIG_P5020_DS) += p5020_ds.o corenet_ds.o | 19 | obj-$(CONFIG_P5020_DS) += p5020_ds.o corenet_ds.o |
diff --git a/arch/powerpc/platforms/85xx/p2040_rdb.c b/arch/powerpc/platforms/85xx/p2041_rdb.c index 32b56ac73dfb..eda6ed5683e1 100644 --- a/arch/powerpc/platforms/85xx/p2040_rdb.c +++ b/arch/powerpc/platforms/85xx/p2041_rdb.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * P2040 RDB Setup | 2 | * P2041 RDB Setup |
3 | * | 3 | * |
4 | * Copyright 2011 Freescale Semiconductor Inc. | 4 | * Copyright 2011 Freescale Semiconductor Inc. |
5 | * | 5 | * |
@@ -35,18 +35,18 @@ | |||
35 | /* | 35 | /* |
36 | * Called very early, device-tree isn't unflattened | 36 | * Called very early, device-tree isn't unflattened |
37 | */ | 37 | */ |
38 | static int __init p2040_rdb_probe(void) | 38 | static int __init p2041_rdb_probe(void) |
39 | { | 39 | { |
40 | unsigned long root = of_get_flat_dt_root(); | 40 | unsigned long root = of_get_flat_dt_root(); |
41 | #ifdef CONFIG_SMP | 41 | #ifdef CONFIG_SMP |
42 | extern struct smp_ops_t smp_85xx_ops; | 42 | extern struct smp_ops_t smp_85xx_ops; |
43 | #endif | 43 | #endif |
44 | 44 | ||
45 | if (of_flat_dt_is_compatible(root, "fsl,P2040RDB")) | 45 | if (of_flat_dt_is_compatible(root, "fsl,P2041RDB")) |
46 | return 1; | 46 | return 1; |
47 | 47 | ||
48 | /* Check if we're running under the Freescale hypervisor */ | 48 | /* Check if we're running under the Freescale hypervisor */ |
49 | if (of_flat_dt_is_compatible(root, "fsl,P2040RDB-hv")) { | 49 | if (of_flat_dt_is_compatible(root, "fsl,P2041RDB-hv")) { |
50 | ppc_md.init_IRQ = ehv_pic_init; | 50 | ppc_md.init_IRQ = ehv_pic_init; |
51 | ppc_md.get_irq = ehv_pic_get_irq; | 51 | ppc_md.get_irq = ehv_pic_get_irq; |
52 | ppc_md.restart = fsl_hv_restart; | 52 | ppc_md.restart = fsl_hv_restart; |
@@ -66,9 +66,9 @@ static int __init p2040_rdb_probe(void) | |||
66 | return 0; | 66 | return 0; |
67 | } | 67 | } |
68 | 68 | ||
69 | define_machine(p2040_rdb) { | 69 | define_machine(p2041_rdb) { |
70 | .name = "P2040 RDB", | 70 | .name = "P2041 RDB", |
71 | .probe = p2040_rdb_probe, | 71 | .probe = p2041_rdb_probe, |
72 | .setup_arch = corenet_ds_setup_arch, | 72 | .setup_arch = corenet_ds_setup_arch, |
73 | .init_IRQ = corenet_ds_pic_init, | 73 | .init_IRQ = corenet_ds_pic_init, |
74 | #ifdef CONFIG_PCI | 74 | #ifdef CONFIG_PCI |
@@ -81,8 +81,8 @@ define_machine(p2040_rdb) { | |||
81 | .power_save = e500_idle, | 81 | .power_save = e500_idle, |
82 | }; | 82 | }; |
83 | 83 | ||
84 | machine_device_initcall(p2040_rdb, corenet_ds_publish_devices); | 84 | machine_device_initcall(p2041_rdb, corenet_ds_publish_devices); |
85 | 85 | ||
86 | #ifdef CONFIG_SWIOTLB | 86 | #ifdef CONFIG_SWIOTLB |
87 | machine_arch_initcall(p2040_rdb, swiotlb_setup_bus_notifier); | 87 | machine_arch_initcall(p2041_rdb, swiotlb_setup_bus_notifier); |
88 | #endif | 88 | #endif |