diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
commit | d9bc125caf592b7d081021f32ce5b717efdf70c8 (patch) | |
tree | 263b7066ba22ddce21db610c0300f6eaac6f2064 /arch/powerpc/boot | |
parent | 43d78ef2ba5bec26d0315859e8324bfc0be23766 (diff) | |
parent | ec2f9d1331f658433411c58077871e1eef4ee1b4 (diff) |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix conflicts.
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r-- | arch/powerpc/boot/Makefile | 1 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8272ads.dts | 55 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8323emds.dts | 345 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8560ads.dts | 10 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc866ads.dts | 162 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc885ads.dts | 185 |
6 files changed, 729 insertions, 29 deletions
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 98392fb5f581..dc779407de14 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
@@ -162,6 +162,7 @@ image-$(CONFIG_PPC_PSERIES) += zImage.pseries | |||
162 | image-$(CONFIG_PPC_MAPLE) += zImage.pseries | 162 | image-$(CONFIG_PPC_MAPLE) += zImage.pseries |
163 | image-$(CONFIG_PPC_IBM_CELL_BLADE) += zImage.pseries | 163 | image-$(CONFIG_PPC_IBM_CELL_BLADE) += zImage.pseries |
164 | image-$(CONFIG_PPC_PS3) += zImage.ps3 | 164 | image-$(CONFIG_PPC_PS3) += zImage.ps3 |
165 | image-$(CONFIG_PPC_CELLEB) += zImage.pseries | ||
165 | image-$(CONFIG_PPC_CHRP) += zImage.chrp | 166 | image-$(CONFIG_PPC_CHRP) += zImage.chrp |
166 | image-$(CONFIG_PPC_EFIKA) += zImage.chrp | 167 | image-$(CONFIG_PPC_EFIKA) += zImage.chrp |
167 | image-$(CONFIG_PPC_PMAC) += zImage.pmac | 168 | image-$(CONFIG_PPC_PMAC) += zImage.pmac |
diff --git a/arch/powerpc/boot/dts/mpc8272ads.dts b/arch/powerpc/boot/dts/mpc8272ads.dts index 34efdd028c4f..26b44f7513dc 100644 --- a/arch/powerpc/boot/dts/mpc8272ads.dts +++ b/arch/powerpc/boot/dts/mpc8272ads.dts | |||
@@ -53,13 +53,20 @@ | |||
53 | reg = <00000000 4000000 f4500000 00000020>; | 53 | reg = <00000000 4000000 f4500000 00000020>; |
54 | }; | 54 | }; |
55 | 55 | ||
56 | chosen { | ||
57 | name = "chosen"; | ||
58 | linux,platform = <0>; | ||
59 | interrupt-controller = <10c00>; | ||
60 | linux,phandle = <400>; | ||
61 | }; | ||
62 | |||
56 | soc8272@f0000000 { | 63 | soc8272@f0000000 { |
57 | #address-cells = <1>; | 64 | #address-cells = <1>; |
58 | #size-cells = <1>; | 65 | #size-cells = <1>; |
59 | #interrupt-cells = <2>; | 66 | #interrupt-cells = <2>; |
60 | device_type = "soc"; | 67 | device_type = "soc"; |
61 | ranges = < 0 0 2 00000000 f0000000 00053000>; | 68 | ranges = <00000000 f0000000 00053000>; |
62 | reg = <f0000000 0>; | 69 | reg = <f0000000 10000>; |
63 | 70 | ||
64 | mdio@0 { | 71 | mdio@0 { |
65 | device_type = "mdio"; | 72 | device_type = "mdio"; |
@@ -71,7 +78,7 @@ | |||
71 | ethernet-phy@0 { | 78 | ethernet-phy@0 { |
72 | linux,phandle = <2452000>; | 79 | linux,phandle = <2452000>; |
73 | interrupt-parent = <10c00>; | 80 | interrupt-parent = <10c00>; |
74 | interrupts = <19 1>; | 81 | interrupts = <17 4>; |
75 | reg = <0>; | 82 | reg = <0>; |
76 | bitbang = [ 12 12 13 02 02 01 ]; | 83 | bitbang = [ 12 12 13 02 02 01 ]; |
77 | device_type = "ethernet-phy"; | 84 | device_type = "ethernet-phy"; |
@@ -79,7 +86,7 @@ | |||
79 | ethernet-phy@1 { | 86 | ethernet-phy@1 { |
80 | linux,phandle = <2452001>; | 87 | linux,phandle = <2452001>; |
81 | interrupt-parent = <10c00>; | 88 | interrupt-parent = <10c00>; |
82 | interrupts = <19 1>; | 89 | interrupts = <17 4>; |
83 | bitbang = [ 12 12 13 02 02 01 ]; | 90 | bitbang = [ 12 12 13 02 02 01 ]; |
84 | reg = <3>; | 91 | reg = <3>; |
85 | device_type = "ethernet-phy"; | 92 | device_type = "ethernet-phy"; |
@@ -90,7 +97,7 @@ | |||
90 | #address-cells = <1>; | 97 | #address-cells = <1>; |
91 | #size-cells = <0>; | 98 | #size-cells = <0>; |
92 | device_type = "network"; | 99 | device_type = "network"; |
93 | device-id = <2>; | 100 | device-id = <1>; |
94 | compatible = "fs_enet"; | 101 | compatible = "fs_enet"; |
95 | model = "FCC"; | 102 | model = "FCC"; |
96 | reg = <11300 20 8400 100 11380 30>; | 103 | reg = <11300 20 8400 100 11380 30>; |
@@ -104,7 +111,7 @@ | |||
104 | 111 | ||
105 | ethernet@25000 { | 112 | ethernet@25000 { |
106 | device_type = "network"; | 113 | device_type = "network"; |
107 | device-id = <3>; | 114 | device-id = <2>; |
108 | compatible = "fs_enet"; | 115 | compatible = "fs_enet"; |
109 | model = "FCC"; | 116 | model = "FCC"; |
110 | reg = <11320 20 8500 100 113b0 30>; | 117 | reg = <11320 20 8500 100 113b0 30>; |
@@ -123,8 +130,8 @@ | |||
123 | #interrupt-cells = <2>; | 130 | #interrupt-cells = <2>; |
124 | device_type = "cpm"; | 131 | device_type = "cpm"; |
125 | model = "CPM2"; | 132 | model = "CPM2"; |
126 | ranges = <00000000 00000000 3ffff>; | 133 | ranges = <00000000 00000000 20000>; |
127 | reg = <10d80 3280>; | 134 | reg = <0 20000>; |
128 | command-proc = <119c0>; | 135 | command-proc = <119c0>; |
129 | brg-frequency = <17D7840>; | 136 | brg-frequency = <17D7840>; |
130 | cpm_clk = <BEBC200>; | 137 | cpm_clk = <BEBC200>; |
@@ -133,7 +140,7 @@ | |||
133 | device_type = "serial"; | 140 | device_type = "serial"; |
134 | compatible = "cpm_uart"; | 141 | compatible = "cpm_uart"; |
135 | model = "SCC"; | 142 | model = "SCC"; |
136 | device-id = <2>; | 143 | device-id = <1>; |
137 | reg = <11a00 20 8000 100>; | 144 | reg = <11a00 20 8000 100>; |
138 | current-speed = <1c200>; | 145 | current-speed = <1c200>; |
139 | interrupts = <28 2>; | 146 | interrupts = <28 2>; |
@@ -147,7 +154,7 @@ | |||
147 | device_type = "serial"; | 154 | device_type = "serial"; |
148 | compatible = "cpm_uart"; | 155 | compatible = "cpm_uart"; |
149 | model = "SCC"; | 156 | model = "SCC"; |
150 | device-id = <5>; | 157 | device-id = <4>; |
151 | reg = <11a60 20 8300 100>; | 158 | reg = <11a60 20 8300 100>; |
152 | current-speed = <1c200>; | 159 | current-speed = <1c200>; |
153 | interrupts = <2b 2>; | 160 | interrupts = <2b 2>; |
@@ -181,24 +188,24 @@ | |||
181 | interrupt-map = < | 188 | interrupt-map = < |
182 | 189 | ||
183 | /* IDSEL 0x16 */ | 190 | /* IDSEL 0x16 */ |
184 | b000 0 0 1 f8200000 40 0 | 191 | b000 0 0 1 f8200000 40 8 |
185 | b000 0 0 2 f8200000 41 0 | 192 | b000 0 0 2 f8200000 41 8 |
186 | b000 0 0 3 f8200000 42 0 | 193 | b000 0 0 3 f8200000 42 8 |
187 | b000 0 0 4 f8200000 43 0 | 194 | b000 0 0 4 f8200000 43 8 |
188 | 195 | ||
189 | /* IDSEL 0x17 */ | 196 | /* IDSEL 0x17 */ |
190 | b800 0 0 1 f8200000 43 0 | 197 | b800 0 0 1 f8200000 43 8 |
191 | b800 0 0 2 f8200000 40 0 | 198 | b800 0 0 2 f8200000 40 8 |
192 | b800 0 0 3 f8200000 41 0 | 199 | b800 0 0 3 f8200000 41 8 |
193 | b800 0 0 4 f8200000 42 0 | 200 | b800 0 0 4 f8200000 42 8 |
194 | 201 | ||
195 | /* IDSEL 0x18 */ | 202 | /* IDSEL 0x18 */ |
196 | c000 0 0 1 f8200000 42 0 | 203 | c000 0 0 1 f8200000 42 8 |
197 | c000 0 0 2 f8200000 43 0 | 204 | c000 0 0 2 f8200000 43 8 |
198 | c000 0 0 3 f8200000 40 0 | 205 | c000 0 0 3 f8200000 40 8 |
199 | c000 0 0 4 f8200000 41 0>; | 206 | c000 0 0 4 f8200000 41 8>; |
200 | interrupt-parent = <10c00>; | 207 | interrupt-parent = <10c00>; |
201 | interrupts = <14 3>; | 208 | interrupts = <14 8>; |
202 | bus-range = <0 0>; | 209 | bus-range = <0 0>; |
203 | ranges = <02000000 0 80000000 80000000 0 40000000 | 210 | ranges = <02000000 0 80000000 80000000 0 40000000 |
204 | 01000000 0 00000000 f6000000 0 02000000>; | 211 | 01000000 0 00000000 f6000000 0 02000000>; |
@@ -210,7 +217,7 @@ | |||
210 | model = "SEC2"; | 217 | model = "SEC2"; |
211 | compatible = "talitos"; | 218 | compatible = "talitos"; |
212 | reg = <30000 10000>; | 219 | reg = <30000 10000>; |
213 | interrupts = <b 0>; | 220 | interrupts = <b 2>; |
214 | interrupt-parent = <10c00>; | 221 | interrupt-parent = <10c00>; |
215 | num-channels = <4>; | 222 | num-channels = <4>; |
216 | channel-fifo-len = <18>; | 223 | channel-fifo-len = <18>; |
diff --git a/arch/powerpc/boot/dts/mpc8323emds.dts b/arch/powerpc/boot/dts/mpc8323emds.dts new file mode 100644 index 000000000000..fa7ef24d205b --- /dev/null +++ b/arch/powerpc/boot/dts/mpc8323emds.dts | |||
@@ -0,0 +1,345 @@ | |||
1 | /* | ||
2 | * MPC8323E EMDS Device Tree Source | ||
3 | * | ||
4 | * Copyright 2006 Freescale Semiconductor Inc. | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify it | ||
7 | * under the terms of the GNU General Public License as published by the | ||
8 | * Free Software Foundation; either version 2 of the License, or (at your | ||
9 | * option) any later version. | ||
10 | */ | ||
11 | |||
12 | / { | ||
13 | model = "MPC8323EMDS"; | ||
14 | compatible = "MPC83xx"; | ||
15 | #address-cells = <1>; | ||
16 | #size-cells = <1>; | ||
17 | linux,phandle = <100>; | ||
18 | |||
19 | cpus { | ||
20 | #cpus = <1>; | ||
21 | #address-cells = <1>; | ||
22 | #size-cells = <0>; | ||
23 | linux,phandle = <200>; | ||
24 | |||
25 | PowerPC,8323@0 { | ||
26 | device_type = "cpu"; | ||
27 | reg = <0>; | ||
28 | d-cache-line-size = <20>; // 32 bytes | ||
29 | i-cache-line-size = <20>; // 32 bytes | ||
30 | d-cache-size = <4000>; // L1, 16K | ||
31 | i-cache-size = <4000>; // L1, 16K | ||
32 | timebase-frequency = <0>; | ||
33 | bus-frequency = <0>; | ||
34 | clock-frequency = <0>; | ||
35 | 32-bit; | ||
36 | linux,phandle = <201>; | ||
37 | linux,boot-cpu; | ||
38 | }; | ||
39 | }; | ||
40 | |||
41 | memory { | ||
42 | device_type = "memory"; | ||
43 | linux,phandle = <300>; | ||
44 | reg = <00000000 08000000>; | ||
45 | }; | ||
46 | |||
47 | bcsr@f8000000 { | ||
48 | device_type = "board-control"; | ||
49 | reg = <f8000000 8000>; | ||
50 | }; | ||
51 | |||
52 | soc8323@e0000000 { | ||
53 | #address-cells = <1>; | ||
54 | #size-cells = <1>; | ||
55 | #interrupt-cells = <2>; | ||
56 | device_type = "soc"; | ||
57 | ranges = <0 e0000000 00100000>; | ||
58 | reg = <e0000000 00000200>; | ||
59 | bus-frequency = <7DE2900>; | ||
60 | |||
61 | wdt@200 { | ||
62 | device_type = "watchdog"; | ||
63 | compatible = "mpc83xx_wdt"; | ||
64 | reg = <200 100>; | ||
65 | }; | ||
66 | |||
67 | i2c@3000 { | ||
68 | device_type = "i2c"; | ||
69 | compatible = "fsl-i2c"; | ||
70 | reg = <3000 100>; | ||
71 | interrupts = <e 8>; | ||
72 | interrupt-parent = <700>; | ||
73 | dfsrr; | ||
74 | }; | ||
75 | |||
76 | serial@4500 { | ||
77 | device_type = "serial"; | ||
78 | compatible = "ns16550"; | ||
79 | reg = <4500 100>; | ||
80 | clock-frequency = <0>; | ||
81 | interrupts = <9 8>; | ||
82 | interrupt-parent = <700>; | ||
83 | }; | ||
84 | |||
85 | serial@4600 { | ||
86 | device_type = "serial"; | ||
87 | compatible = "ns16550"; | ||
88 | reg = <4600 100>; | ||
89 | clock-frequency = <0>; | ||
90 | interrupts = <a 8>; | ||
91 | interrupt-parent = <700>; | ||
92 | }; | ||
93 | |||
94 | crypto@30000 { | ||
95 | device_type = "crypto"; | ||
96 | model = "SEC2"; | ||
97 | compatible = "talitos"; | ||
98 | reg = <30000 7000>; | ||
99 | interrupts = <b 8>; | ||
100 | interrupt-parent = <700>; | ||
101 | /* Rev. 2.2 */ | ||
102 | num-channels = <1>; | ||
103 | channel-fifo-len = <18>; | ||
104 | exec-units-mask = <0000004c>; | ||
105 | descriptor-types-mask = <0122003f>; | ||
106 | }; | ||
107 | |||
108 | pci@8500 { | ||
109 | linux,phandle = <8500>; | ||
110 | interrupt-map-mask = <f800 0 0 7>; | ||
111 | interrupt-map = < | ||
112 | /* IDSEL 0x11 AD17 */ | ||
113 | 8800 0 0 1 700 14 8 | ||
114 | 8800 0 0 2 700 15 8 | ||
115 | 8800 0 0 3 700 16 8 | ||
116 | 8800 0 0 4 700 17 8 | ||
117 | |||
118 | /* IDSEL 0x12 AD18 */ | ||
119 | 9000 0 0 1 700 16 8 | ||
120 | 9000 0 0 2 700 17 8 | ||
121 | 9000 0 0 3 700 14 8 | ||
122 | 9000 0 0 4 700 15 8 | ||
123 | |||
124 | /* IDSEL 0x13 AD19 */ | ||
125 | 9800 0 0 1 700 17 8 | ||
126 | 9800 0 0 2 700 14 8 | ||
127 | 9800 0 0 3 700 15 8 | ||
128 | 9800 0 0 4 700 16 8 | ||
129 | |||
130 | /* IDSEL 0x15 AD21*/ | ||
131 | a800 0 0 1 700 14 8 | ||
132 | a800 0 0 2 700 15 8 | ||
133 | a800 0 0 3 700 16 8 | ||
134 | a800 0 0 4 700 17 8 | ||
135 | |||
136 | /* IDSEL 0x16 AD22*/ | ||
137 | b000 0 0 1 700 17 8 | ||
138 | b000 0 0 2 700 14 8 | ||
139 | b000 0 0 3 700 15 8 | ||
140 | b000 0 0 4 700 16 8 | ||
141 | |||
142 | /* IDSEL 0x17 AD23*/ | ||
143 | b800 0 0 1 700 16 8 | ||
144 | b800 0 0 2 700 17 8 | ||
145 | b800 0 0 3 700 14 8 | ||
146 | b800 0 0 4 700 15 8 | ||
147 | |||
148 | /* IDSEL 0x18 AD24*/ | ||
149 | c000 0 0 1 700 15 8 | ||
150 | c000 0 0 2 700 16 8 | ||
151 | c000 0 0 3 700 17 8 | ||
152 | c000 0 0 4 700 14 8>; | ||
153 | interrupt-parent = <700>; | ||
154 | interrupts = <42 8>; | ||
155 | bus-range = <0 0>; | ||
156 | ranges = <02000000 0 a0000000 90000000 0 10000000 | ||
157 | 42000000 0 80000000 80000000 0 10000000 | ||
158 | 01000000 0 00000000 d0000000 0 00100000>; | ||
159 | clock-frequency = <0>; | ||
160 | #interrupt-cells = <1>; | ||
161 | #size-cells = <2>; | ||
162 | #address-cells = <3>; | ||
163 | reg = <8500 100>; | ||
164 | compatible = "83xx"; | ||
165 | device_type = "pci"; | ||
166 | }; | ||
167 | |||
168 | pic@700 { | ||
169 | linux,phandle = <700>; | ||
170 | interrupt-controller; | ||
171 | #address-cells = <0>; | ||
172 | #interrupt-cells = <2>; | ||
173 | reg = <700 100>; | ||
174 | built-in; | ||
175 | device_type = "ipic"; | ||
176 | }; | ||
177 | |||
178 | par_io@1400 { | ||
179 | reg = <1400 100>; | ||
180 | device_type = "par_io"; | ||
181 | num-ports = <7>; | ||
182 | |||
183 | ucc_pin@03 { | ||
184 | linux,phandle = <140003>; | ||
185 | pio-map = < | ||
186 | /* port pin dir open_drain assignment has_irq */ | ||
187 | 3 4 3 0 2 0 /* MDIO */ | ||
188 | 3 5 1 0 2 0 /* MDC */ | ||
189 | 0 d 2 0 1 0 /* RX_CLK (CLK9) */ | ||
190 | 3 18 2 0 1 0 /* TX_CLK (CLK10) */ | ||
191 | 1 1 1 0 1 0 /* TxD1 */ | ||
192 | 1 0 1 0 1 0 /* TxD0 */ | ||
193 | 1 1 1 0 1 0 /* TxD1 */ | ||
194 | 1 2 1 0 1 0 /* TxD2 */ | ||
195 | 1 3 1 0 1 0 /* TxD3 */ | ||
196 | 1 4 2 0 1 0 /* RxD0 */ | ||
197 | 1 5 2 0 1 0 /* RxD1 */ | ||
198 | 1 6 2 0 1 0 /* RxD2 */ | ||
199 | 1 7 2 0 1 0 /* RxD3 */ | ||
200 | 1 8 2 0 1 0 /* RX_ER */ | ||
201 | 1 9 1 0 1 0 /* TX_ER */ | ||
202 | 1 a 2 0 1 0 /* RX_DV */ | ||
203 | 1 b 2 0 1 0 /* COL */ | ||
204 | 1 c 1 0 1 0 /* TX_EN */ | ||
205 | 1 d 2 0 1 0>;/* CRS */ | ||
206 | }; | ||
207 | ucc_pin@04 { | ||
208 | linux,phandle = <140004>; | ||
209 | pio-map = < | ||
210 | /* port pin dir open_drain assignment has_irq */ | ||
211 | 3 1f 2 0 1 0 /* RX_CLK (CLK7) */ | ||
212 | 3 6 2 0 1 0 /* TX_CLK (CLK8) */ | ||
213 | 1 12 1 0 1 0 /* TxD0 */ | ||
214 | 1 13 1 0 1 0 /* TxD1 */ | ||
215 | 1 14 1 0 1 0 /* TxD2 */ | ||
216 | 1 15 1 0 1 0 /* TxD3 */ | ||
217 | 1 16 2 0 1 0 /* RxD0 */ | ||
218 | 1 17 2 0 1 0 /* RxD1 */ | ||
219 | 1 18 2 0 1 0 /* RxD2 */ | ||
220 | 1 19 2 0 1 0 /* RxD3 */ | ||
221 | 1 1a 2 0 1 0 /* RX_ER */ | ||
222 | 1 1b 1 0 1 0 /* TX_ER */ | ||
223 | 1 1c 2 0 1 0 /* RX_DV */ | ||
224 | 1 1d 2 0 1 0 /* COL */ | ||
225 | 1 1e 1 0 1 0 /* TX_EN */ | ||
226 | 1 1f 2 0 1 0>;/* CRS */ | ||
227 | }; | ||
228 | }; | ||
229 | }; | ||
230 | |||
231 | qe@e0100000 { | ||
232 | #address-cells = <1>; | ||
233 | #size-cells = <1>; | ||
234 | device_type = "qe"; | ||
235 | model = "QE"; | ||
236 | ranges = <0 e0100000 00100000>; | ||
237 | reg = <e0100000 480>; | ||
238 | brg-frequency = <0>; | ||
239 | bus-frequency = <BCD3D80>; | ||
240 | |||
241 | muram@10000 { | ||
242 | device_type = "muram"; | ||
243 | ranges = <0 00010000 00004000>; | ||
244 | |||
245 | data-only@0 { | ||
246 | reg = <0 4000>; | ||
247 | }; | ||
248 | }; | ||
249 | |||
250 | spi@4c0 { | ||
251 | device_type = "spi"; | ||
252 | compatible = "fsl_spi"; | ||
253 | reg = <4c0 40>; | ||
254 | interrupts = <2>; | ||
255 | interrupt-parent = <80>; | ||
256 | mode = "cpu"; | ||
257 | }; | ||
258 | |||
259 | spi@500 { | ||
260 | device_type = "spi"; | ||
261 | compatible = "fsl_spi"; | ||
262 | reg = <500 40>; | ||
263 | interrupts = <1>; | ||
264 | interrupt-parent = <80>; | ||
265 | mode = "cpu"; | ||
266 | }; | ||
267 | |||
268 | usb@6c0 { | ||
269 | device_type = "usb"; | ||
270 | compatible = "qe_udc"; | ||
271 | reg = <6c0 40 8B00 100>; | ||
272 | interrupts = <b>; | ||
273 | interrupt-parent = <80>; | ||
274 | mode = "slave"; | ||
275 | }; | ||
276 | |||
277 | ucc@2200 { | ||
278 | device_type = "network"; | ||
279 | compatible = "ucc_geth"; | ||
280 | model = "UCC"; | ||
281 | device-id = <3>; | ||
282 | reg = <2200 200>; | ||
283 | interrupts = <22>; | ||
284 | interrupt-parent = <80>; | ||
285 | mac-address = [ 00 04 9f 00 23 23 ]; | ||
286 | rx-clock = <19>; | ||
287 | tx-clock = <1a>; | ||
288 | phy-handle = <212003>; | ||
289 | pio-handle = <140003>; | ||
290 | }; | ||
291 | |||
292 | ucc@3200 { | ||
293 | device_type = "network"; | ||
294 | compatible = "ucc_geth"; | ||
295 | model = "UCC"; | ||
296 | device-id = <4>; | ||
297 | reg = <3000 200>; | ||
298 | interrupts = <23>; | ||
299 | interrupt-parent = <80>; | ||
300 | mac-address = [ 00 11 22 33 44 55 ]; | ||
301 | rx-clock = <17>; | ||
302 | tx-clock = <18>; | ||
303 | phy-handle = <212004>; | ||
304 | pio-handle = <140004>; | ||
305 | }; | ||
306 | |||
307 | mdio@2320 { | ||
308 | #address-cells = <1>; | ||
309 | #size-cells = <0>; | ||
310 | reg = <2320 18>; | ||
311 | device_type = "mdio"; | ||
312 | compatible = "ucc_geth_phy"; | ||
313 | |||
314 | ethernet-phy@03 { | ||
315 | linux,phandle = <212003>; | ||
316 | interrupt-parent = <700>; | ||
317 | interrupts = <11 2>; | ||
318 | reg = <3>; | ||
319 | device_type = "ethernet-phy"; | ||
320 | interface = <3>; //ENET_100_MII | ||
321 | }; | ||
322 | ethernet-phy@04 { | ||
323 | linux,phandle = <212004>; | ||
324 | interrupt-parent = <700>; | ||
325 | interrupts = <12 2>; | ||
326 | reg = <4>; | ||
327 | device_type = "ethernet-phy"; | ||
328 | interface = <3>; | ||
329 | }; | ||
330 | }; | ||
331 | |||
332 | qeic@80 { | ||
333 | linux,phandle = <80>; | ||
334 | interrupt-controller; | ||
335 | device_type = "qeic"; | ||
336 | #address-cells = <0>; | ||
337 | #interrupt-cells = <1>; | ||
338 | reg = <80 80>; | ||
339 | built-in; | ||
340 | big-endian; | ||
341 | interrupts = <20 8 21 8>; //high:32 low:33 | ||
342 | interrupt-parent = <700>; | ||
343 | }; | ||
344 | }; | ||
345 | }; | ||
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts index 2b168486aeba..119bd5d3a834 100644 --- a/arch/powerpc/boot/dts/mpc8560ads.dts +++ b/arch/powerpc/boot/dts/mpc8560ads.dts | |||
@@ -200,7 +200,7 @@ | |||
200 | a800 0 0 4 40000 31 1>; | 200 | a800 0 0 4 40000 31 1>; |
201 | 201 | ||
202 | interrupt-parent = <40000>; | 202 | interrupt-parent = <40000>; |
203 | interrupts = <42 0>; | 203 | interrupts = <8 0>; |
204 | bus-range = <0 0>; | 204 | bus-range = <0 0>; |
205 | ranges = <02000000 0 80000000 80000000 0 20000000 | 205 | ranges = <02000000 0 80000000 80000000 0 20000000 |
206 | 01000000 0 00000000 e2000000 0 01000000>; | 206 | 01000000 0 00000000 e2000000 0 01000000>; |
@@ -250,7 +250,7 @@ | |||
250 | rx-clock = <1>; | 250 | rx-clock = <1>; |
251 | tx-clock = <1>; | 251 | tx-clock = <1>; |
252 | current-speed = <1c200>; | 252 | current-speed = <1c200>; |
253 | interrupts = <64 1>; | 253 | interrupts = <28 8>; |
254 | interrupt-parent = <90c00>; | 254 | interrupt-parent = <90c00>; |
255 | }; | 255 | }; |
256 | 256 | ||
@@ -264,7 +264,7 @@ | |||
264 | rx-clock = <2>; | 264 | rx-clock = <2>; |
265 | tx-clock = <2>; | 265 | tx-clock = <2>; |
266 | current-speed = <1c200>; | 266 | current-speed = <1c200>; |
267 | interrupts = <65 1>; | 267 | interrupts = <29 8>; |
268 | interrupt-parent = <90c00>; | 268 | interrupt-parent = <90c00>; |
269 | }; | 269 | }; |
270 | 270 | ||
@@ -278,7 +278,7 @@ | |||
278 | clock-setup = <ff00ffff 250000>; | 278 | clock-setup = <ff00ffff 250000>; |
279 | rx-clock = <15>; | 279 | rx-clock = <15>; |
280 | tx-clock = <16>; | 280 | tx-clock = <16>; |
281 | interrupts = <5d 1>; | 281 | interrupts = <21 8>; |
282 | interrupt-parent = <90c00>; | 282 | interrupt-parent = <90c00>; |
283 | phy-handle = <2452002>; | 283 | phy-handle = <2452002>; |
284 | }; | 284 | }; |
@@ -293,7 +293,7 @@ | |||
293 | clock-setup = <ffff00ff 3700>; | 293 | clock-setup = <ffff00ff 3700>; |
294 | rx-clock = <17>; | 294 | rx-clock = <17>; |
295 | tx-clock = <18>; | 295 | tx-clock = <18>; |
296 | interrupts = <5e 1>; | 296 | interrupts = <22 8>; |
297 | interrupt-parent = <90c00>; | 297 | interrupt-parent = <90c00>; |
298 | phy-handle = <2452003>; | 298 | phy-handle = <2452003>; |
299 | }; | 299 | }; |
diff --git a/arch/powerpc/boot/dts/mpc866ads.dts b/arch/powerpc/boot/dts/mpc866ads.dts new file mode 100644 index 000000000000..5d4005239b83 --- /dev/null +++ b/arch/powerpc/boot/dts/mpc866ads.dts | |||
@@ -0,0 +1,162 @@ | |||
1 | /* | ||
2 | * MPC866 ADS Device Tree Source | ||
3 | * | ||
4 | * Copyright 2006 MontaVista Software, Inc. | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify it | ||
7 | * under the terms of the GNU General Public License as published by the | ||
8 | * Free Software Foundation; either version 2 of the License, or (at your | ||
9 | * option) any later version. | ||
10 | */ | ||
11 | |||
12 | |||
13 | / { | ||
14 | model = "MPC866ADS"; | ||
15 | compatible = "mpc8xx"; | ||
16 | #address-cells = <1>; | ||
17 | #size-cells = <1>; | ||
18 | linux,phandle = <100>; | ||
19 | |||
20 | cpus { | ||
21 | #cpus = <1>; | ||
22 | #address-cells = <1>; | ||
23 | #size-cells = <0>; | ||
24 | linux,phandle = <200>; | ||
25 | |||
26 | PowerPC,866@0 { | ||
27 | device_type = "cpu"; | ||
28 | reg = <0>; | ||
29 | d-cache-line-size = <20>; // 32 bytes | ||
30 | i-cache-line-size = <20>; // 32 bytes | ||
31 | d-cache-size = <2000>; // L1, 8K | ||
32 | i-cache-size = <4000>; // L1, 16K | ||
33 | timebase-frequency = <0>; | ||
34 | bus-frequency = <0>; | ||
35 | clock-frequency = <0>; | ||
36 | 32-bit; | ||
37 | interrupts = <f 2>; // decrementer interrupt | ||
38 | interrupt-parent = <ff000000>; | ||
39 | linux,phandle = <201>; | ||
40 | linux,boot-cpu; | ||
41 | }; | ||
42 | }; | ||
43 | |||
44 | memory { | ||
45 | device_type = "memory"; | ||
46 | linux,phandle = <300>; | ||
47 | reg = <00000000 800000>; | ||
48 | }; | ||
49 | |||
50 | soc866@ff000000 { | ||
51 | #address-cells = <1>; | ||
52 | #size-cells = <1>; | ||
53 | #interrupt-cells = <2>; | ||
54 | device_type = "soc"; | ||
55 | ranges = <0 ff000000 00100000>; | ||
56 | reg = <ff000000 00000200>; | ||
57 | bus-frequency = <0>; | ||
58 | mdio@e80 { | ||
59 | device_type = "mdio"; | ||
60 | compatible = "fs_enet"; | ||
61 | reg = <e80 8>; | ||
62 | linux,phandle = <e80>; | ||
63 | #address-cells = <1>; | ||
64 | #size-cells = <0>; | ||
65 | ethernet-phy@f { | ||
66 | linux,phandle = <e800f>; | ||
67 | reg = <f>; | ||
68 | device_type = "ethernet-phy"; | ||
69 | }; | ||
70 | }; | ||
71 | |||
72 | fec@e00 { | ||
73 | device_type = "network"; | ||
74 | compatible = "fs_enet"; | ||
75 | model = "FEC"; | ||
76 | device-id = <1>; | ||
77 | reg = <e00 188>; | ||
78 | mac-address = [ 00 00 0C 00 01 FD ]; | ||
79 | interrupts = <3 1>; | ||
80 | interrupt-parent = <ff000000>; | ||
81 | phy-handle = <e800f>; | ||
82 | }; | ||
83 | |||
84 | pic@ff000000 { | ||
85 | linux,phandle = <ff000000>; | ||
86 | interrupt-controller; | ||
87 | #address-cells = <0>; | ||
88 | #interrupt-cells = <2>; | ||
89 | reg = <0 24>; | ||
90 | built-in; | ||
91 | device_type = "mpc8xx-pic"; | ||
92 | compatible = "CPM"; | ||
93 | }; | ||
94 | |||
95 | cpm@ff000000 { | ||
96 | linux,phandle = <ff000000>; | ||
97 | #address-cells = <1>; | ||
98 | #size-cells = <1>; | ||
99 | #interrupt-cells = <2>; | ||
100 | device_type = "cpm"; | ||
101 | model = "CPM"; | ||
102 | ranges = <0 0 4000>; | ||
103 | reg = <860 f0>; | ||
104 | command-proc = <9c0>; | ||
105 | brg-frequency = <0>; | ||
106 | interrupts = <0 2>; // cpm error interrupt | ||
107 | interrupt-parent = <930>; | ||
108 | |||
109 | pic@930 { | ||
110 | linux,phandle = <930>; | ||
111 | interrupt-controller; | ||
112 | #address-cells = <0>; | ||
113 | #interrupt-cells = <2>; | ||
114 | interrupts = <5 2 0 2>; | ||
115 | interrupt-parent = <ff000000>; | ||
116 | reg = <930 20>; | ||
117 | built-in; | ||
118 | device_type = "cpm-pic"; | ||
119 | compatible = "CPM"; | ||
120 | }; | ||
121 | |||
122 | smc@a80 { | ||
123 | device_type = "serial"; | ||
124 | compatible = "cpm_uart"; | ||
125 | model = "SMC"; | ||
126 | device-id = <1>; | ||
127 | reg = <a80 10 3e80 40>; | ||
128 | clock-setup = <00ffffff 0>; | ||
129 | rx-clock = <1>; | ||
130 | tx-clock = <1>; | ||
131 | current-speed = <0>; | ||
132 | interrupts = <4 3>; | ||
133 | interrupt-parent = <930>; | ||
134 | }; | ||
135 | |||
136 | smc@a90 { | ||
137 | device_type = "serial"; | ||
138 | compatible = "cpm_uart"; | ||
139 | model = "SMC"; | ||
140 | device-id = <2>; | ||
141 | reg = <a90 20 3f80 40>; | ||
142 | clock-setup = <ff00ffff 90000>; | ||
143 | rx-clock = <2>; | ||
144 | tx-clock = <2>; | ||
145 | current-speed = <0>; | ||
146 | interrupts = <3 3>; | ||
147 | interrupt-parent = <930>; | ||
148 | }; | ||
149 | |||
150 | scc@a00 { | ||
151 | device_type = "network"; | ||
152 | compatible = "fs_enet"; | ||
153 | model = "SCC"; | ||
154 | device-id = <1>; | ||
155 | reg = <a00 18 3c00 80>; | ||
156 | mac-address = [ 00 00 0C 00 03 FD ]; | ||
157 | interrupts = <1e 3>; | ||
158 | interrupt-parent = <930>; | ||
159 | }; | ||
160 | }; | ||
161 | }; | ||
162 | }; | ||
diff --git a/arch/powerpc/boot/dts/mpc885ads.dts b/arch/powerpc/boot/dts/mpc885ads.dts new file mode 100644 index 000000000000..cf1a19f962c5 --- /dev/null +++ b/arch/powerpc/boot/dts/mpc885ads.dts | |||
@@ -0,0 +1,185 @@ | |||
1 | /* | ||
2 | * MPC885 ADS Device Tree Source | ||
3 | * | ||
4 | * Copyright 2006 MontaVista Software, Inc. | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify it | ||
7 | * under the terms of the GNU General Public License as published by the | ||
8 | * Free Software Foundation; either version 2 of the License, or (at your | ||
9 | * option) any later version. | ||
10 | */ | ||
11 | |||
12 | |||
13 | / { | ||
14 | model = "MPC885ADS"; | ||
15 | compatible = "mpc8xx"; | ||
16 | #address-cells = <1>; | ||
17 | #size-cells = <1>; | ||
18 | linux,phandle = <100>; | ||
19 | |||
20 | cpus { | ||
21 | #cpus = <1>; | ||
22 | #address-cells = <1>; | ||
23 | #size-cells = <0>; | ||
24 | linux,phandle = <200>; | ||
25 | |||
26 | PowerPC,885@0 { | ||
27 | device_type = "cpu"; | ||
28 | reg = <0>; | ||
29 | d-cache-line-size = <20>; // 32 bytes | ||
30 | i-cache-line-size = <20>; // 32 bytes | ||
31 | d-cache-size = <2000>; // L1, 8K | ||
32 | i-cache-size = <2000>; // L1, 8K | ||
33 | timebase-frequency = <0>; | ||
34 | bus-frequency = <0>; | ||
35 | clock-frequency = <0>; | ||
36 | 32-bit; | ||
37 | interrupts = <f 2>; // decrementer interrupt | ||
38 | interrupt-parent = <ff000000>; | ||
39 | linux,phandle = <201>; | ||
40 | linux,boot-cpu; | ||
41 | }; | ||
42 | }; | ||
43 | |||
44 | memory { | ||
45 | device_type = "memory"; | ||
46 | linux,phandle = <300>; | ||
47 | reg = <00000000 800000>; | ||
48 | }; | ||
49 | |||
50 | soc885@ff000000 { | ||
51 | #address-cells = <1>; | ||
52 | #size-cells = <1>; | ||
53 | #interrupt-cells = <2>; | ||
54 | device_type = "soc"; | ||
55 | ranges = <0 ff000000 00100000>; | ||
56 | reg = <ff000000 00000200>; | ||
57 | bus-frequency = <0>; | ||
58 | mdio@e80 { | ||
59 | device_type = "mdio"; | ||
60 | compatible = "fs_enet"; | ||
61 | reg = <e80 8>; | ||
62 | linux,phandle = <e80>; | ||
63 | #address-cells = <1>; | ||
64 | #size-cells = <0>; | ||
65 | ethernet-phy@0 { | ||
66 | linux,phandle = <e8000>; | ||
67 | reg = <0>; | ||
68 | device_type = "ethernet-phy"; | ||
69 | }; | ||
70 | ethernet-phy@1 { | ||
71 | linux,phandle = <e8001>; | ||
72 | reg = <1>; | ||
73 | device_type = "ethernet-phy"; | ||
74 | }; | ||
75 | ethernet-phy@2 { | ||
76 | linux,phandle = <e8002>; | ||
77 | reg = <2>; | ||
78 | device_type = "ethernet-phy"; | ||
79 | }; | ||
80 | }; | ||
81 | |||
82 | fec@e00 { | ||
83 | device_type = "network"; | ||
84 | compatible = "fs_enet"; | ||
85 | model = "FEC"; | ||
86 | device-id = <1>; | ||
87 | reg = <e00 188>; | ||
88 | mac-address = [ 00 00 0C 00 01 FD ]; | ||
89 | interrupts = <3 1>; | ||
90 | interrupt-parent = <ff000000>; | ||
91 | phy-handle = <e8000>; | ||
92 | }; | ||
93 | |||
94 | fec@1e00 { | ||
95 | device_type = "network"; | ||
96 | compatible = "fs_enet"; | ||
97 | model = "FEC"; | ||
98 | device-id = <2>; | ||
99 | reg = <1e00 188>; | ||
100 | mac-address = [ 00 00 0C 00 02 FD ]; | ||
101 | interrupts = <7 1>; | ||
102 | interrupt-parent = <ff000000>; | ||
103 | phy-handle = <e8001>; | ||
104 | }; | ||
105 | |||
106 | pic@ff000000 { | ||
107 | linux,phandle = <ff000000>; | ||
108 | interrupt-controller; | ||
109 | #address-cells = <0>; | ||
110 | #interrupt-cells = <2>; | ||
111 | reg = <0 24>; | ||
112 | built-in; | ||
113 | device_type = "mpc8xx-pic"; | ||
114 | compatible = "CPM"; | ||
115 | }; | ||
116 | |||
117 | cpm@ff000000 { | ||
118 | linux,phandle = <ff000000>; | ||
119 | #address-cells = <1>; | ||
120 | #size-cells = <1>; | ||
121 | #interrupt-cells = <2>; | ||
122 | device_type = "cpm"; | ||
123 | model = "CPM"; | ||
124 | ranges = <0 0 4000>; | ||
125 | reg = <860 f0>; | ||
126 | command-proc = <9c0>; | ||
127 | brg-frequency = <0>; | ||
128 | interrupts = <0 2>; // cpm error interrupt | ||
129 | interrupt-parent = <930>; | ||
130 | |||
131 | pic@930 { | ||
132 | linux,phandle = <930>; | ||
133 | interrupt-controller; | ||
134 | #address-cells = <0>; | ||
135 | #interrupt-cells = <2>; | ||
136 | interrupts = <5 2 0 2>; | ||
137 | interrupt-parent = <ff000000>; | ||
138 | reg = <930 20>; | ||
139 | built-in; | ||
140 | device_type = "cpm-pic"; | ||
141 | compatible = "CPM"; | ||
142 | }; | ||
143 | |||
144 | smc@a80 { | ||
145 | device_type = "serial"; | ||
146 | compatible = "cpm_uart"; | ||
147 | model = "SMC"; | ||
148 | device-id = <1>; | ||
149 | reg = <a80 10 3e80 40>; | ||
150 | clock-setup = <00ffffff 0>; | ||
151 | rx-clock = <1>; | ||
152 | tx-clock = <1>; | ||
153 | current-speed = <0>; | ||
154 | interrupts = <4 3>; | ||
155 | interrupt-parent = <930>; | ||
156 | }; | ||
157 | |||
158 | smc@a90 { | ||
159 | device_type = "serial"; | ||
160 | compatible = "cpm_uart"; | ||
161 | model = "SMC"; | ||
162 | device-id = <2>; | ||
163 | reg = <a90 20 3f80 40>; | ||
164 | clock-setup = <ff00ffff 90000>; | ||
165 | rx-clock = <2>; | ||
166 | tx-clock = <2>; | ||
167 | current-speed = <0>; | ||
168 | interrupts = <3 3>; | ||
169 | interrupt-parent = <930>; | ||
170 | }; | ||
171 | |||
172 | scc@a40 { | ||
173 | device_type = "network"; | ||
174 | compatible = "fs_enet"; | ||
175 | model = "SCC"; | ||
176 | device-id = <3>; | ||
177 | reg = <a40 18 3e00 80>; | ||
178 | mac-address = [ 00 00 0C 00 03 FD ]; | ||
179 | interrupts = <1c 3>; | ||
180 | interrupt-parent = <930>; | ||
181 | phy-handle = <e8002>; | ||
182 | }; | ||
183 | }; | ||
184 | }; | ||
185 | }; | ||