diff options
-rw-r--r-- | arch/powerpc/boot/dts/hcu4.dts | 168 | ||||
-rw-r--r-- | arch/powerpc/configs/40x/hcu4_defconfig | 80 | ||||
-rw-r--r-- | arch/powerpc/configs/ppc40x_defconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/40x/Kconfig | 8 | ||||
-rw-r--r-- | arch/powerpc/platforms/40x/Makefile | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/40x/hcu4.c | 61 |
6 files changed, 0 insertions, 319 deletions
diff --git a/arch/powerpc/boot/dts/hcu4.dts b/arch/powerpc/boot/dts/hcu4.dts deleted file mode 100644 index 7988598da4c9..000000000000 --- a/arch/powerpc/boot/dts/hcu4.dts +++ /dev/null | |||
@@ -1,168 +0,0 @@ | |||
1 | /* | ||
2 | * Device Tree Source for Netstal Maschinen HCU4 | ||
3 | * based on the IBM Walnut | ||
4 | * | ||
5 | * Copyright 2008 | ||
6 | * Niklaus Giger <niklaus.giger@member.fsf.org> | ||
7 | * | ||
8 | * Copyright 2007 IBM Corp. | ||
9 | * Josh Boyer <jwboyer@linux.vnet.ibm.com> | ||
10 | * | ||
11 | * This file is licensed under the terms of the GNU General Public | ||
12 | * License version 2. This program is licensed "as is" without | ||
13 | * any warranty of any kind, whether express or implied. | ||
14 | */ | ||
15 | |||
16 | /dts-v1/; | ||
17 | |||
18 | / { | ||
19 | #address-cells = <0x1>; | ||
20 | #size-cells = <0x1>; | ||
21 | model = "netstal,hcu4"; | ||
22 | compatible = "netstal,hcu4"; | ||
23 | dcr-parent = <0x1>; | ||
24 | |||
25 | aliases { | ||
26 | ethernet0 = "/plb/opb/ethernet@ef600800"; | ||
27 | serial0 = "/plb/opb/serial@ef600300"; | ||
28 | }; | ||
29 | |||
30 | cpus { | ||
31 | #address-cells = <0x1>; | ||
32 | #size-cells = <0x0>; | ||
33 | |||
34 | cpu@0 { | ||
35 | device_type = "cpu"; | ||
36 | model = "PowerPC,405GPr"; | ||
37 | reg = <0x0>; | ||
38 | clock-frequency = <0>; /* Filled in by U-Boot */ | ||
39 | timebase-frequency = <0x0>; /* Filled in by U-Boot */ | ||
40 | i-cache-line-size = <0x20>; | ||
41 | d-cache-line-size = <0x20>; | ||
42 | i-cache-size = <0x4000>; | ||
43 | d-cache-size = <0x4000>; | ||
44 | dcr-controller; | ||
45 | dcr-access-method = "native"; | ||
46 | linux,phandle = <0x1>; | ||
47 | }; | ||
48 | }; | ||
49 | |||
50 | memory { | ||
51 | device_type = "memory"; | ||
52 | reg = <0x0 0x0>; /* Filled in by U-Boot */ | ||
53 | }; | ||
54 | |||
55 | UIC0: interrupt-controller { | ||
56 | compatible = "ibm,uic"; | ||
57 | interrupt-controller; | ||
58 | cell-index = <0x0>; | ||
59 | dcr-reg = <0xc0 0x9>; | ||
60 | #address-cells = <0x0>; | ||
61 | #size-cells = <0x0>; | ||
62 | #interrupt-cells = <0x2>; | ||
63 | linux,phandle = <0x2>; | ||
64 | }; | ||
65 | |||
66 | plb { | ||
67 | compatible = "ibm,plb3"; | ||
68 | #address-cells = <0x1>; | ||
69 | #size-cells = <0x1>; | ||
70 | ranges; | ||
71 | clock-frequency = <0x0>; /* Filled in by U-Boot */ | ||
72 | |||
73 | SDRAM0: memory-controller { | ||
74 | compatible = "ibm,sdram-405gp"; | ||
75 | dcr-reg = <0x10 0x2>; | ||
76 | }; | ||
77 | |||
78 | MAL: mcmal { | ||
79 | compatible = "ibm,mcmal-405gp", "ibm,mcmal"; | ||
80 | dcr-reg = <0x180 0x62>; | ||
81 | num-tx-chans = <0x1>; | ||
82 | num-rx-chans = <0x1>; | ||
83 | interrupt-parent = <0x2>; | ||
84 | interrupts = <0xb 0x4 0xc 0x4 0xa 0x4 0xd 0x4 0xe 0x4>; | ||
85 | linux,phandle = <0x3>; | ||
86 | }; | ||
87 | |||
88 | POB0: opb { | ||
89 | compatible = "ibm,opb-405gp", "ibm,opb"; | ||
90 | #address-cells = <0x1>; | ||
91 | #size-cells = <0x1>; | ||
92 | ranges = <0xef600000 0xef600000 0xa00000>; | ||
93 | dcr-reg = <0xa0 0x5>; | ||
94 | clock-frequency = <0x0>; /* Filled in by U-Boot */ | ||
95 | |||
96 | UART0: serial@ef600300 { | ||
97 | device_type = "serial"; | ||
98 | compatible = "ns16550"; | ||
99 | reg = <0xef600300 0x8>; | ||
100 | virtual-reg = <0xef600300>; | ||
101 | clock-frequency = <0x0>;/* Filled in by U-Boot */ | ||
102 | current-speed = <0>; /* Filled in by U-Boot */ | ||
103 | interrupt-parent = <0x2>; | ||
104 | interrupts = <0x0 0x4>; | ||
105 | }; | ||
106 | |||
107 | IIC: i2c@ef600500 { | ||
108 | compatible = "ibm,iic-405gp", "ibm,iic"; | ||
109 | reg = <0xef600500 0x11>; | ||
110 | interrupt-parent = <0x2>; | ||
111 | interrupts = <0x2 0x4>; | ||
112 | }; | ||
113 | |||
114 | GPIO: gpio@ef600700 { | ||
115 | compatible = "ibm,gpio-405gp"; | ||
116 | reg = <0xef600700 0x20>; | ||
117 | }; | ||
118 | |||
119 | EMAC: ethernet@ef600800 { | ||
120 | device_type = "network"; | ||
121 | compatible = "ibm,emac-405gp", "ibm,emac"; | ||
122 | interrupt-parent = <0x2>; | ||
123 | interrupts = <0xf 0x4 0x9 0x4>; | ||
124 | local-mac-address = [00 00 00 00 00 00]; | ||
125 | reg = <0xef600800 0x70>; | ||
126 | mal-device = <0x3>; | ||
127 | mal-tx-channel = <0x0>; | ||
128 | mal-rx-channel = <0x0>; | ||
129 | cell-index = <0x0>; | ||
130 | max-frame-size = <0x5dc>; | ||
131 | rx-fifo-size = <0x1000>; | ||
132 | tx-fifo-size = <0x800>; | ||
133 | phy-mode = "rmii"; | ||
134 | phy-map = <0x1>; | ||
135 | }; | ||
136 | }; | ||
137 | |||
138 | EBC0: ebc { | ||
139 | compatible = "ibm,ebc-405gp", "ibm,ebc"; | ||
140 | dcr-reg = <0x12 0x2>; | ||
141 | #address-cells = <0x2>; | ||
142 | #size-cells = <0x1>; | ||
143 | clock-frequency = <0x0>; /* Filled in by U-Boot */ | ||
144 | |||
145 | sram@0,0 { | ||
146 | reg = <0x0 0x0 0x80000>; | ||
147 | }; | ||
148 | |||
149 | flash@0,80000 { | ||
150 | compatible = "jedec-flash"; | ||
151 | bank-width = <0x1>; | ||
152 | reg = <0x0 0x80000 0x80000>; | ||
153 | #address-cells = <0x1>; | ||
154 | #size-cells = <0x1>; | ||
155 | |||
156 | partition@0 { | ||
157 | label = "OpenBIOS"; | ||
158 | reg = <0x0 0x80000>; | ||
159 | read-only; | ||
160 | }; | ||
161 | }; | ||
162 | }; | ||
163 | }; | ||
164 | |||
165 | chosen { | ||
166 | linux,stdout-path = "/plb/opb/serial@ef600300"; | ||
167 | }; | ||
168 | }; | ||
diff --git a/arch/powerpc/configs/40x/hcu4_defconfig b/arch/powerpc/configs/40x/hcu4_defconfig deleted file mode 100644 index ebeb4accad65..000000000000 --- a/arch/powerpc/configs/40x/hcu4_defconfig +++ /dev/null | |||
@@ -1,80 +0,0 @@ | |||
1 | CONFIG_40x=y | ||
2 | CONFIG_EXPERIMENTAL=y | ||
3 | CONFIG_SYSVIPC=y | ||
4 | CONFIG_POSIX_MQUEUE=y | ||
5 | CONFIG_LOG_BUF_SHIFT=14 | ||
6 | CONFIG_BLK_DEV_INITRD=y | ||
7 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
8 | CONFIG_EXPERT=y | ||
9 | CONFIG_KALLSYMS_ALL=y | ||
10 | CONFIG_KALLSYMS_EXTRA_PASS=y | ||
11 | CONFIG_MODULES=y | ||
12 | CONFIG_MODULE_UNLOAD=y | ||
13 | # CONFIG_BLK_DEV_BSG is not set | ||
14 | CONFIG_HCU4=y | ||
15 | # CONFIG_WALNUT is not set | ||
16 | CONFIG_SPARSE_IRQ=y | ||
17 | CONFIG_PCI=y | ||
18 | CONFIG_NET=y | ||
19 | CONFIG_PACKET=y | ||
20 | CONFIG_UNIX=y | ||
21 | CONFIG_INET=y | ||
22 | CONFIG_IP_PNP=y | ||
23 | CONFIG_IP_PNP_DHCP=y | ||
24 | CONFIG_IP_PNP_BOOTP=y | ||
25 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
26 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
27 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
28 | # CONFIG_INET_LRO is not set | ||
29 | # CONFIG_IPV6 is not set | ||
30 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
31 | CONFIG_CONNECTOR=y | ||
32 | CONFIG_MTD=y | ||
33 | CONFIG_MTD_PARTITIONS=y | ||
34 | CONFIG_MTD_CMDLINE_PARTS=y | ||
35 | CONFIG_MTD_OF_PARTS=y | ||
36 | CONFIG_MTD_CHAR=y | ||
37 | CONFIG_MTD_BLOCK=m | ||
38 | CONFIG_MTD_CFI=y | ||
39 | CONFIG_MTD_JEDECPROBE=y | ||
40 | CONFIG_MTD_CFI_AMDSTD=y | ||
41 | CONFIG_MTD_PHYSMAP_OF=y | ||
42 | CONFIG_PROC_DEVICETREE=y | ||
43 | CONFIG_BLK_DEV_RAM=y | ||
44 | CONFIG_BLK_DEV_RAM_SIZE=35000 | ||
45 | CONFIG_NETDEVICES=y | ||
46 | CONFIG_NET_ETHERNET=y | ||
47 | CONFIG_IBM_NEW_EMAC=y | ||
48 | # CONFIG_INPUT is not set | ||
49 | # CONFIG_SERIO is not set | ||
50 | # CONFIG_VT is not set | ||
51 | CONFIG_SERIAL_8250=y | ||
52 | CONFIG_SERIAL_8250_CONSOLE=y | ||
53 | CONFIG_SERIAL_8250_EXTENDED=y | ||
54 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
55 | CONFIG_SERIAL_OF_PLATFORM=y | ||
56 | # CONFIG_HW_RANDOM is not set | ||
57 | # CONFIG_HWMON is not set | ||
58 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
59 | # CONFIG_USB_SUPPORT is not set | ||
60 | CONFIG_EXT2_FS=y | ||
61 | CONFIG_INOTIFY=y | ||
62 | CONFIG_PROC_KCORE=y | ||
63 | CONFIG_TMPFS=y | ||
64 | CONFIG_CRAMFS=y | ||
65 | CONFIG_NFS_FS=y | ||
66 | CONFIG_NFS_V3=y | ||
67 | CONFIG_ROOT_NFS=y | ||
68 | CONFIG_MAGIC_SYSRQ=y | ||
69 | CONFIG_DEBUG_FS=y | ||
70 | CONFIG_DEBUG_KERNEL=y | ||
71 | CONFIG_DETECT_HUNG_TASK=y | ||
72 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
73 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
74 | CONFIG_CRYPTO=y | ||
75 | CONFIG_CRYPTO_CBC=y | ||
76 | CONFIG_CRYPTO_ECB=y | ||
77 | CONFIG_CRYPTO_PCBC=y | ||
78 | CONFIG_CRYPTO_MD5=y | ||
79 | CONFIG_CRYPTO_DES=y | ||
80 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
diff --git a/arch/powerpc/configs/ppc40x_defconfig b/arch/powerpc/configs/ppc40x_defconfig index bfd634b5ada7..e9d920c5a87a 100644 --- a/arch/powerpc/configs/ppc40x_defconfig +++ b/arch/powerpc/configs/ppc40x_defconfig | |||
@@ -14,7 +14,6 @@ CONFIG_MODULE_UNLOAD=y | |||
14 | CONFIG_PPC4xx_GPIO=y | 14 | CONFIG_PPC4xx_GPIO=y |
15 | CONFIG_ACADIA=y | 15 | CONFIG_ACADIA=y |
16 | CONFIG_EP405=y | 16 | CONFIG_EP405=y |
17 | CONFIG_HCU4=y | ||
18 | CONFIG_HOTFOOT=y | 17 | CONFIG_HOTFOOT=y |
19 | CONFIG_KILAUEA=y | 18 | CONFIG_KILAUEA=y |
20 | CONFIG_MAKALU=y | 19 | CONFIG_MAKALU=y |
diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig index d733d7ca939c..ae5e0bfc0234 100644 --- a/arch/powerpc/platforms/40x/Kconfig +++ b/arch/powerpc/platforms/40x/Kconfig | |||
@@ -32,14 +32,6 @@ config EP405 | |||
32 | help | 32 | help |
33 | This option enables support for the EP405/EP405PC boards. | 33 | This option enables support for the EP405/EP405PC boards. |
34 | 34 | ||
35 | config HCU4 | ||
36 | bool "Hcu4" | ||
37 | depends on 40x | ||
38 | default n | ||
39 | select 405GPR | ||
40 | help | ||
41 | This option enables support for the Nestal Maschinen HCU4 board. | ||
42 | |||
43 | config HOTFOOT | 35 | config HOTFOOT |
44 | bool "Hotfoot" | 36 | bool "Hotfoot" |
45 | depends on 40x | 37 | depends on 40x |
diff --git a/arch/powerpc/platforms/40x/Makefile b/arch/powerpc/platforms/40x/Makefile index 56e89004c468..88c22de0c850 100644 --- a/arch/powerpc/platforms/40x/Makefile +++ b/arch/powerpc/platforms/40x/Makefile | |||
@@ -1,4 +1,3 @@ | |||
1 | obj-$(CONFIG_HCU4) += hcu4.o | ||
2 | obj-$(CONFIG_WALNUT) += walnut.o | 1 | obj-$(CONFIG_WALNUT) += walnut.o |
3 | obj-$(CONFIG_XILINX_VIRTEX_GENERIC_BOARD) += virtex.o | 2 | obj-$(CONFIG_XILINX_VIRTEX_GENERIC_BOARD) += virtex.o |
4 | obj-$(CONFIG_EP405) += ep405.o | 3 | obj-$(CONFIG_EP405) += ep405.o |
diff --git a/arch/powerpc/platforms/40x/hcu4.c b/arch/powerpc/platforms/40x/hcu4.c deleted file mode 100644 index 60b2afecab75..000000000000 --- a/arch/powerpc/platforms/40x/hcu4.c +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | /* | ||
2 | * Architecture- / platform-specific boot-time initialization code for | ||
3 | * IBM PowerPC 4xx based boards. Adapted from original | ||
4 | * code by Gary Thomas, Cort Dougan <cort@fsmlabs.com>, and Dan Malek | ||
5 | * <dan@net4x.com>. | ||
6 | * | ||
7 | * Copyright(c) 1999-2000 Grant Erickson <grant@lcse.umn.edu> | ||
8 | * | ||
9 | * Rewritten and ported to the merged powerpc tree: | ||
10 | * Copyright 2007 IBM Corporation | ||
11 | * Josh Boyer <jwboyer@linux.vnet.ibm.com> | ||
12 | * | ||
13 | * 2002 (c) MontaVista, Software, Inc. This file is licensed under | ||
14 | * the terms of the GNU General Public License version 2. This program | ||
15 | * is licensed "as is" without any warranty of any kind, whether express | ||
16 | * or implied. | ||
17 | */ | ||
18 | |||
19 | #include <linux/init.h> | ||
20 | #include <linux/of_platform.h> | ||
21 | |||
22 | #include <asm/machdep.h> | ||
23 | #include <asm/prom.h> | ||
24 | #include <asm/udbg.h> | ||
25 | #include <asm/time.h> | ||
26 | #include <asm/uic.h> | ||
27 | #include <asm/ppc4xx.h> | ||
28 | |||
29 | static __initdata struct of_device_id hcu4_of_bus[] = { | ||
30 | { .compatible = "ibm,plb3", }, | ||
31 | { .compatible = "ibm,opb", }, | ||
32 | { .compatible = "ibm,ebc", }, | ||
33 | {}, | ||
34 | }; | ||
35 | |||
36 | static int __init hcu4_device_probe(void) | ||
37 | { | ||
38 | of_platform_bus_probe(NULL, hcu4_of_bus, NULL); | ||
39 | return 0; | ||
40 | } | ||
41 | machine_device_initcall(hcu4, hcu4_device_probe); | ||
42 | |||
43 | static int __init hcu4_probe(void) | ||
44 | { | ||
45 | unsigned long root = of_get_flat_dt_root(); | ||
46 | |||
47 | if (!of_flat_dt_is_compatible(root, "netstal,hcu4")) | ||
48 | return 0; | ||
49 | |||
50 | return 1; | ||
51 | } | ||
52 | |||
53 | define_machine(hcu4) { | ||
54 | .name = "HCU4", | ||
55 | .probe = hcu4_probe, | ||
56 | .progress = udbg_progress, | ||
57 | .init_IRQ = uic_init_tree, | ||
58 | .get_irq = uic_get_irq, | ||
59 | .restart = ppc4xx_reset_system, | ||
60 | .calibrate_decr = generic_calibrate_decr, | ||
61 | }; | ||