diff options
-rw-r--r-- | arch/powerpc/boot/dts/mpc836x_mds.dts (renamed from arch/powerpc/boot/dts/mpc8360emds.dts) | 0 | ||||
-rw-r--r-- | arch/powerpc/configs/mpc836x_mds_defconfig (renamed from arch/powerpc/configs/mpc8360emds_defconfig) | 29 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/Kconfig | 8 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/Makefile | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc836x_mds.c (renamed from arch/powerpc/platforms/83xx/mpc8360e_pb.c) | 40 |
5 files changed, 45 insertions, 34 deletions
diff --git a/arch/powerpc/boot/dts/mpc8360emds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts index 4fe45c021848..4fe45c021848 100644 --- a/arch/powerpc/boot/dts/mpc8360emds.dts +++ b/arch/powerpc/boot/dts/mpc836x_mds.dts | |||
diff --git a/arch/powerpc/configs/mpc8360emds_defconfig b/arch/powerpc/configs/mpc836x_mds_defconfig index bbe38ccc3d86..8eb475cd0df0 100644 --- a/arch/powerpc/configs/mpc8360emds_defconfig +++ b/arch/powerpc/configs/mpc836x_mds_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.20-rc5 | 3 | # Linux kernel version: 2.6.20 |
4 | # Fri Jan 26 00:19:45 2007 | 4 | # Sat Feb 17 10:09:26 2007 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | CONFIG_PPC32=y | 7 | CONFIG_PPC32=y |
@@ -34,9 +34,9 @@ CONFIG_DEFAULT_UIMAGE=y | |||
34 | CONFIG_PPC_83xx=y | 34 | CONFIG_PPC_83xx=y |
35 | # CONFIG_PPC_85xx is not set | 35 | # CONFIG_PPC_85xx is not set |
36 | # CONFIG_PPC_86xx is not set | 36 | # CONFIG_PPC_86xx is not set |
37 | # CONFIG_PPC_8xx is not set | ||
37 | # CONFIG_40x is not set | 38 | # CONFIG_40x is not set |
38 | # CONFIG_44x is not set | 39 | # CONFIG_44x is not set |
39 | # CONFIG_8xx is not set | ||
40 | # CONFIG_E200 is not set | 40 | # CONFIG_E200 is not set |
41 | CONFIG_6xx=y | 41 | CONFIG_6xx=y |
42 | CONFIG_83xx=y | 42 | CONFIG_83xx=y |
@@ -63,6 +63,7 @@ CONFIG_LOCALVERSION_AUTO=y | |||
63 | CONFIG_SWAP=y | 63 | CONFIG_SWAP=y |
64 | CONFIG_SYSVIPC=y | 64 | CONFIG_SYSVIPC=y |
65 | # CONFIG_IPC_NS is not set | 65 | # CONFIG_IPC_NS is not set |
66 | CONFIG_SYSVIPC_SYSCTL=y | ||
66 | # CONFIG_POSIX_MQUEUE is not set | 67 | # CONFIG_POSIX_MQUEUE is not set |
67 | # CONFIG_BSD_PROCESS_ACCT is not set | 68 | # CONFIG_BSD_PROCESS_ACCT is not set |
68 | # CONFIG_TASKSTATS is not set | 69 | # CONFIG_TASKSTATS is not set |
@@ -129,10 +130,11 @@ CONFIG_PPC_GEN550=y | |||
129 | # | 130 | # |
130 | # Platform support | 131 | # Platform support |
131 | # | 132 | # |
133 | # CONFIG_MPC8313_RDB is not set | ||
132 | # CONFIG_MPC832x_MDS is not set | 134 | # CONFIG_MPC832x_MDS is not set |
133 | # CONFIG_MPC834x_SYS is not set | 135 | # CONFIG_MPC834x_MDS is not set |
134 | # CONFIG_MPC834x_ITX is not set | 136 | # CONFIG_MPC834x_ITX is not set |
135 | CONFIG_MPC8360E_PB=y | 137 | CONFIG_MPC836x_MDS=y |
136 | CONFIG_PPC_MPC836x=y | 138 | CONFIG_PPC_MPC836x=y |
137 | # CONFIG_MPIC is not set | 139 | # CONFIG_MPIC is not set |
138 | 140 | ||
@@ -162,6 +164,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
162 | # CONFIG_SPARSEMEM_STATIC is not set | 164 | # CONFIG_SPARSEMEM_STATIC is not set |
163 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 165 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
164 | # CONFIG_RESOURCES_64BIT is not set | 166 | # CONFIG_RESOURCES_64BIT is not set |
167 | CONFIG_ZONE_DMA_FLAG=1 | ||
165 | CONFIG_PROC_DEVICETREE=y | 168 | CONFIG_PROC_DEVICETREE=y |
166 | # CONFIG_CMDLINE_BOOL is not set | 169 | # CONFIG_CMDLINE_BOOL is not set |
167 | # CONFIG_PM is not set | 170 | # CONFIG_PM is not set |
@@ -171,6 +174,7 @@ CONFIG_ISA_DMA_API=y | |||
171 | # | 174 | # |
172 | # Bus options | 175 | # Bus options |
173 | # | 176 | # |
177 | CONFIG_ZONE_DMA=y | ||
174 | CONFIG_GENERIC_ISA_DMA=y | 178 | CONFIG_GENERIC_ISA_DMA=y |
175 | # CONFIG_MPIC_WEIRD is not set | 179 | # CONFIG_MPIC_WEIRD is not set |
176 | # CONFIG_PPC_I8259 is not set | 180 | # CONFIG_PPC_I8259 is not set |
@@ -219,6 +223,7 @@ CONFIG_UNIX=y | |||
219 | CONFIG_XFRM=y | 223 | CONFIG_XFRM=y |
220 | # CONFIG_XFRM_USER is not set | 224 | # CONFIG_XFRM_USER is not set |
221 | # CONFIG_XFRM_SUB_POLICY is not set | 225 | # CONFIG_XFRM_SUB_POLICY is not set |
226 | # CONFIG_XFRM_MIGRATE is not set | ||
222 | # CONFIG_NET_KEY is not set | 227 | # CONFIG_NET_KEY is not set |
223 | CONFIG_INET=y | 228 | CONFIG_INET=y |
224 | CONFIG_IP_MULTICAST=y | 229 | CONFIG_IP_MULTICAST=y |
@@ -528,6 +533,7 @@ CONFIG_UCC_GETH=y | |||
528 | # Ethernet (10000 Mbit) | 533 | # Ethernet (10000 Mbit) |
529 | # | 534 | # |
530 | # CONFIG_CHELSIO_T1 is not set | 535 | # CONFIG_CHELSIO_T1 is not set |
536 | # CONFIG_CHELSIO_T3 is not set | ||
531 | # CONFIG_IXGB is not set | 537 | # CONFIG_IXGB is not set |
532 | # CONFIG_S2IO is not set | 538 | # CONFIG_S2IO is not set |
533 | # CONFIG_MYRI10GE is not set | 539 | # CONFIG_MYRI10GE is not set |
@@ -620,6 +626,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
620 | CONFIG_SERIAL_CORE=y | 626 | CONFIG_SERIAL_CORE=y |
621 | CONFIG_SERIAL_CORE_CONSOLE=y | 627 | CONFIG_SERIAL_CORE_CONSOLE=y |
622 | # CONFIG_SERIAL_JSM is not set | 628 | # CONFIG_SERIAL_JSM is not set |
629 | # CONFIG_SERIAL_OF_PLATFORM is not set | ||
623 | CONFIG_UNIX98_PTYS=y | 630 | CONFIG_UNIX98_PTYS=y |
624 | CONFIG_LEGACY_PTYS=y | 631 | CONFIG_LEGACY_PTYS=y |
625 | CONFIG_LEGACY_PTY_COUNT=256 | 632 | CONFIG_LEGACY_PTY_COUNT=256 |
@@ -690,6 +697,7 @@ CONFIG_I2C_MPC=y | |||
690 | # CONFIG_I2C_NFORCE2 is not set | 697 | # CONFIG_I2C_NFORCE2 is not set |
691 | # CONFIG_I2C_OCORES is not set | 698 | # CONFIG_I2C_OCORES is not set |
692 | # CONFIG_I2C_PARPORT_LIGHT is not set | 699 | # CONFIG_I2C_PARPORT_LIGHT is not set |
700 | # CONFIG_I2C_PASEMI is not set | ||
693 | # CONFIG_I2C_PROSAVAGE is not set | 701 | # CONFIG_I2C_PROSAVAGE is not set |
694 | # CONFIG_I2C_SAVAGE4 is not set | 702 | # CONFIG_I2C_SAVAGE4 is not set |
695 | # CONFIG_I2C_SIS5595 is not set | 703 | # CONFIG_I2C_SIS5595 is not set |
@@ -804,6 +812,7 @@ CONFIG_FIRMWARE_EDID=y | |||
804 | # HID Devices | 812 | # HID Devices |
805 | # | 813 | # |
806 | CONFIG_HID=y | 814 | CONFIG_HID=y |
815 | # CONFIG_HID_DEBUG is not set | ||
807 | 816 | ||
808 | # | 817 | # |
809 | # USB support | 818 | # USB support |
@@ -868,6 +877,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
868 | # | 877 | # |
869 | 878 | ||
870 | # | 879 | # |
880 | # Auxiliary Display support | ||
881 | # | ||
882 | |||
883 | # | ||
871 | # Virtualization | 884 | # Virtualization |
872 | # | 885 | # |
873 | 886 | ||
@@ -1011,7 +1024,8 @@ CONFIG_BITREVERSE=y | |||
1011 | CONFIG_CRC32=y | 1024 | CONFIG_CRC32=y |
1012 | # CONFIG_LIBCRC32C is not set | 1025 | # CONFIG_LIBCRC32C is not set |
1013 | CONFIG_PLIST=y | 1026 | CONFIG_PLIST=y |
1014 | CONFIG_IOMAP_COPY=y | 1027 | CONFIG_HAS_IOMEM=y |
1028 | CONFIG_HAS_IOPORT=y | ||
1015 | 1029 | ||
1016 | # | 1030 | # |
1017 | # Instrumentation Support | 1031 | # Instrumentation Support |
@@ -1060,8 +1074,10 @@ CONFIG_CRYPTO_MD5=y | |||
1060 | # CONFIG_CRYPTO_GF128MUL is not set | 1074 | # CONFIG_CRYPTO_GF128MUL is not set |
1061 | CONFIG_CRYPTO_ECB=m | 1075 | CONFIG_CRYPTO_ECB=m |
1062 | CONFIG_CRYPTO_CBC=y | 1076 | CONFIG_CRYPTO_CBC=y |
1077 | CONFIG_CRYPTO_PCBC=m | ||
1063 | # CONFIG_CRYPTO_LRW is not set | 1078 | # CONFIG_CRYPTO_LRW is not set |
1064 | CONFIG_CRYPTO_DES=y | 1079 | CONFIG_CRYPTO_DES=y |
1080 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1065 | # CONFIG_CRYPTO_BLOWFISH is not set | 1081 | # CONFIG_CRYPTO_BLOWFISH is not set |
1066 | # CONFIG_CRYPTO_TWOFISH is not set | 1082 | # CONFIG_CRYPTO_TWOFISH is not set |
1067 | # CONFIG_CRYPTO_SERPENT is not set | 1083 | # CONFIG_CRYPTO_SERPENT is not set |
@@ -1075,6 +1091,7 @@ CONFIG_CRYPTO_DES=y | |||
1075 | # CONFIG_CRYPTO_DEFLATE is not set | 1091 | # CONFIG_CRYPTO_DEFLATE is not set |
1076 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1092 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1077 | # CONFIG_CRYPTO_CRC32C is not set | 1093 | # CONFIG_CRYPTO_CRC32C is not set |
1094 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1078 | # CONFIG_CRYPTO_TEST is not set | 1095 | # CONFIG_CRYPTO_TEST is not set |
1079 | 1096 | ||
1080 | # | 1097 | # |
diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig index 1aea1e69ff31..713b31a16ce9 100644 --- a/arch/powerpc/platforms/83xx/Kconfig +++ b/arch/powerpc/platforms/83xx/Kconfig | |||
@@ -38,12 +38,12 @@ config MPC834x_ITX | |||
38 | Be aware that PCI initialization is the bootloader's | 38 | Be aware that PCI initialization is the bootloader's |
39 | responsibility. | 39 | responsibility. |
40 | 40 | ||
41 | config MPC8360E_PB | 41 | config MPC836x_MDS |
42 | bool "Freescale MPC8360E PB" | 42 | bool "Freescale MPC836x MDS" |
43 | select DEFAULT_UIMAGE | 43 | select DEFAULT_UIMAGE |
44 | select QUICC_ENGINE | 44 | select QUICC_ENGINE |
45 | help | 45 | help |
46 | This option enables support for the MPC836x EMDS Processor Board. | 46 | This option enables support for the MPC836x MDS Processor Board. |
47 | 47 | ||
48 | endchoice | 48 | endchoice |
49 | 49 | ||
@@ -69,6 +69,6 @@ config PPC_MPC836x | |||
69 | bool | 69 | bool |
70 | select PPC_UDBG_16550 | 70 | select PPC_UDBG_16550 |
71 | select PPC_INDIRECT_PCI | 71 | select PPC_INDIRECT_PCI |
72 | default y if MPC8360E_PB | 72 | default y if MPC836x_MDS |
73 | 73 | ||
74 | endmenu | 74 | endmenu |
diff --git a/arch/powerpc/platforms/83xx/Makefile b/arch/powerpc/platforms/83xx/Makefile index 6c8199c4c382..dfc970d0df10 100644 --- a/arch/powerpc/platforms/83xx/Makefile +++ b/arch/powerpc/platforms/83xx/Makefile | |||
@@ -6,5 +6,5 @@ obj-$(CONFIG_PCI) += pci.o | |||
6 | obj-$(CONFIG_MPC8313_RDB) += mpc8313_rdb.o | 6 | obj-$(CONFIG_MPC8313_RDB) += mpc8313_rdb.o |
7 | obj-$(CONFIG_MPC834x_MDS) += mpc834x_mds.o | 7 | obj-$(CONFIG_MPC834x_MDS) += mpc834x_mds.o |
8 | obj-$(CONFIG_MPC834x_ITX) += mpc834x_itx.o | 8 | obj-$(CONFIG_MPC834x_ITX) += mpc834x_itx.o |
9 | obj-$(CONFIG_MPC8360E_PB) += mpc8360e_pb.o | 9 | obj-$(CONFIG_MPC836x_MDS) += mpc836x_mds.o |
10 | obj-$(CONFIG_MPC832x_MDS) += mpc832x_mds.o | 10 | obj-$(CONFIG_MPC832x_MDS) += mpc832x_mds.o |
diff --git a/arch/powerpc/platforms/83xx/mpc8360e_pb.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c index b25e6a116233..526ed090a446 100644 --- a/arch/powerpc/platforms/83xx/mpc8360e_pb.c +++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c | |||
@@ -5,12 +5,12 @@ | |||
5 | * Yin Olivia <Hong-hua.Yin@freescale.com> | 5 | * Yin Olivia <Hong-hua.Yin@freescale.com> |
6 | * | 6 | * |
7 | * Description: | 7 | * Description: |
8 | * MPC8360E MDS PB board specific routines. | 8 | * MPC8360E MDS board specific routines. |
9 | * | 9 | * |
10 | * Changelog: | 10 | * Changelog: |
11 | * Jun 21, 2006 Initial version | 11 | * Jun 21, 2006 Initial version |
12 | * | 12 | * |
13 | * This program is free software; you can redistribute it and/or modify it | 13 | * This program is free software; you can redistribute it and/or modify it |
14 | * under the terms of the GNU General Public License as published by the | 14 | * under the terms of the GNU General Public License as published by the |
15 | * Free Software Foundation; either version 2 of the License, or (at your | 15 | * Free Software Foundation; either version 2 of the License, or (at your |
16 | * option) any later version. | 16 | * option) any later version. |
@@ -62,22 +62,17 @@ unsigned long isa_mem_base = 0; | |||
62 | 62 | ||
63 | static u8 *bcsr_regs = NULL; | 63 | static u8 *bcsr_regs = NULL; |
64 | 64 | ||
65 | u8 *get_bcsr(void) | ||
66 | { | ||
67 | return bcsr_regs; | ||
68 | } | ||
69 | |||
70 | /* ************************************************************************ | 65 | /* ************************************************************************ |
71 | * | 66 | * |
72 | * Setup the architecture | 67 | * Setup the architecture |
73 | * | 68 | * |
74 | */ | 69 | */ |
75 | static void __init mpc8360_sys_setup_arch(void) | 70 | static void __init mpc836x_mds_setup_arch(void) |
76 | { | 71 | { |
77 | struct device_node *np; | 72 | struct device_node *np; |
78 | 73 | ||
79 | if (ppc_md.progress) | 74 | if (ppc_md.progress) |
80 | ppc_md.progress("mpc8360_sys_setup_arch()", 0); | 75 | ppc_md.progress("mpc836x_mds_setup_arch()", 0); |
81 | 76 | ||
82 | /* Map BCSR area */ | 77 | /* Map BCSR area */ |
83 | np = of_find_node_by_name(NULL, "bcsr"); | 78 | np = of_find_node_by_name(NULL, "bcsr"); |
@@ -128,7 +123,7 @@ static struct of_device_id mpc836x_ids[] = { | |||
128 | 123 | ||
129 | static int __init mpc836x_declare_of_platform_devices(void) | 124 | static int __init mpc836x_declare_of_platform_devices(void) |
130 | { | 125 | { |
131 | if (!machine_is(mpc8360_sys)) | 126 | if (!machine_is(mpc836x_mds)) |
132 | return 0; | 127 | return 0; |
133 | 128 | ||
134 | /* Publish the QE devices */ | 129 | /* Publish the QE devices */ |
@@ -138,9 +133,8 @@ static int __init mpc836x_declare_of_platform_devices(void) | |||
138 | } | 133 | } |
139 | device_initcall(mpc836x_declare_of_platform_devices); | 134 | device_initcall(mpc836x_declare_of_platform_devices); |
140 | 135 | ||
141 | static void __init mpc8360_sys_init_IRQ(void) | 136 | static void __init mpc836x_mds_init_IRQ(void) |
142 | { | 137 | { |
143 | |||
144 | struct device_node *np; | 138 | struct device_node *np; |
145 | 139 | ||
146 | np = of_find_node_by_type(NULL, "ipic"); | 140 | np = of_find_node_by_type(NULL, "ipic"); |
@@ -173,7 +167,7 @@ static int __init mpc8360_rtc_hookup(void) | |||
173 | { | 167 | { |
174 | struct timespec tv; | 168 | struct timespec tv; |
175 | 169 | ||
176 | if (!machine_is(mpc8360_sys)) | 170 | if (!machine_is(mpc836x_mds)) |
177 | return 0; | 171 | return 0; |
178 | 172 | ||
179 | ppc_md.get_rtc_time = ds1374_get_rtc_time; | 173 | ppc_md.get_rtc_time = ds1374_get_rtc_time; |
@@ -192,21 +186,21 @@ late_initcall(mpc8360_rtc_hookup); | |||
192 | /* | 186 | /* |
193 | * Called very early, MMU is off, device-tree isn't unflattened | 187 | * Called very early, MMU is off, device-tree isn't unflattened |
194 | */ | 188 | */ |
195 | static int __init mpc8360_sys_probe(void) | 189 | static int __init mpc836x_mds_probe(void) |
196 | { | 190 | { |
197 | unsigned long root = of_get_flat_dt_root(); | 191 | unsigned long root = of_get_flat_dt_root(); |
198 | 192 | ||
199 | return of_flat_dt_is_compatible(root, "MPC836xMDS"); | 193 | return of_flat_dt_is_compatible(root, "MPC836xMDS"); |
200 | } | 194 | } |
201 | 195 | ||
202 | define_machine(mpc8360_sys) { | 196 | define_machine(mpc836x_mds) { |
203 | .name = "MPC8360E PB", | 197 | .name = "MPC836x MDS", |
204 | .probe = mpc8360_sys_probe, | 198 | .probe = mpc836x_mds_probe, |
205 | .setup_arch = mpc8360_sys_setup_arch, | 199 | .setup_arch = mpc836x_mds_setup_arch, |
206 | .init_IRQ = mpc8360_sys_init_IRQ, | 200 | .init_IRQ = mpc836x_mds_init_IRQ, |
207 | .get_irq = ipic_get_irq, | 201 | .get_irq = ipic_get_irq, |
208 | .restart = mpc83xx_restart, | 202 | .restart = mpc83xx_restart, |
209 | .time_init = mpc83xx_time_init, | 203 | .time_init = mpc83xx_time_init, |
210 | .calibrate_decr = generic_calibrate_decr, | 204 | .calibrate_decr = generic_calibrate_decr, |
211 | .progress = udbg_progress, | 205 | .progress = udbg_progress, |
212 | }; | 206 | }; |