diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-12 00:55:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-12 00:55:47 -0400 |
commit | e86908614f2c7fec401827e5cefd7a6ea9407f85 (patch) | |
tree | fcb5d9e52422b37bdaf0e647126ebdfc1680f162 /arch/powerpc/boot/dts/mpc8560ads.dts | |
parent | 547307420931344a868275bd7ea7a30f117a15a9 (diff) | |
parent | 9b4b8feb962f4b3e74768b7205f1f8f6cce87238 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (408 commits)
[POWERPC] Add memchr() to the bootwrapper
[POWERPC] Implement logging of unhandled signals
[POWERPC] Add legacy serial support for OPB with flattened device tree
[POWERPC] Use 1TB segments
[POWERPC] XilinxFB: Allow fixed framebuffer base address
[POWERPC] XilinxFB: Add support for custom screen resolution
[POWERPC] XilinxFB: Use pdata to pass around framebuffer parameters
[POWERPC] PCI: Add 64-bit physical address support to setup_indirect_pci
[POWERPC] 4xx: Kilauea defconfig file
[POWERPC] 4xx: Kilauea DTS
[POWERPC] 4xx: Add AMCC Kilauea eval board support to platforms/40x
[POWERPC] 4xx: Add AMCC 405EX support to cputable.c
[POWERPC] Adjust TASK_SIZE on ppc32 systems to 3GB that are capable
[POWERPC] Use PAGE_OFFSET to tell if an address is user/kernel in SW TLB handlers
[POWERPC] 85xx: Enable FP emulation in MPC8560 ADS defconfig
[POWERPC] 85xx: Killed <asm/mpc85xx.h>
[POWERPC] 85xx: Add cpm nodes for 8541/8555 CDS
[POWERPC] 85xx: Convert mpc8560ads to the new CPM binding.
[POWERPC] mpc8272ads: Remove muram from the CPM reg property.
[POWERPC] Make clockevents work on PPC601 processors
...
Fixed up conflict in Documentation/powerpc/booting-without-of.txt manually.
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8560ads.dts')
-rw-r--r-- | arch/powerpc/boot/dts/mpc8560ads.dts | 267 |
1 files changed, 134 insertions, 133 deletions
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts index 16dbe848cecf..6b362f8222c1 100644 --- a/arch/powerpc/boot/dts/mpc8560ads.dts +++ b/arch/powerpc/boot/dts/mpc8560ads.dts | |||
@@ -30,7 +30,6 @@ | |||
30 | timebase-frequency = <04ead9a0>; | 30 | timebase-frequency = <04ead9a0>; |
31 | bus-frequency = <13ab6680>; | 31 | bus-frequency = <13ab6680>; |
32 | clock-frequency = <312c8040>; | 32 | clock-frequency = <312c8040>; |
33 | 32-bit; | ||
34 | }; | 33 | }; |
35 | }; | 34 | }; |
36 | 35 | ||
@@ -42,7 +41,6 @@ | |||
42 | soc8560@e0000000 { | 41 | soc8560@e0000000 { |
43 | #address-cells = <1>; | 42 | #address-cells = <1>; |
44 | #size-cells = <1>; | 43 | #size-cells = <1>; |
45 | #interrupt-cells = <2>; | ||
46 | device_type = "soc"; | 44 | device_type = "soc"; |
47 | ranges = <0 e0000000 00100000>; | 45 | ranges = <0 e0000000 00100000>; |
48 | reg = <e0000000 00000200>; | 46 | reg = <e0000000 00000200>; |
@@ -132,115 +130,39 @@ | |||
132 | phy-handle = <&phy1>; | 130 | phy-handle = <&phy1>; |
133 | }; | 131 | }; |
134 | 132 | ||
135 | pci@8000 { | ||
136 | #interrupt-cells = <1>; | ||
137 | #size-cells = <2>; | ||
138 | #address-cells = <3>; | ||
139 | compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci"; | ||
140 | device_type = "pci"; | ||
141 | reg = <8000 1000>; | ||
142 | clock-frequency = <3f940aa>; | ||
143 | interrupt-map-mask = <f800 0 0 7>; | ||
144 | interrupt-map = < | ||
145 | |||
146 | /* IDSEL 0x2 */ | ||
147 | 1000 0 0 1 &mpic 1 1 | ||
148 | 1000 0 0 2 &mpic 2 1 | ||
149 | 1000 0 0 3 &mpic 3 1 | ||
150 | 1000 0 0 4 &mpic 4 1 | ||
151 | |||
152 | /* IDSEL 0x3 */ | ||
153 | 1800 0 0 1 &mpic 4 1 | ||
154 | 1800 0 0 2 &mpic 1 1 | ||
155 | 1800 0 0 3 &mpic 2 1 | ||
156 | 1800 0 0 4 &mpic 3 1 | ||
157 | |||
158 | /* IDSEL 0x4 */ | ||
159 | 2000 0 0 1 &mpic 3 1 | ||
160 | 2000 0 0 2 &mpic 4 1 | ||
161 | 2000 0 0 3 &mpic 1 1 | ||
162 | 2000 0 0 4 &mpic 2 1 | ||
163 | |||
164 | /* IDSEL 0x5 */ | ||
165 | 2800 0 0 1 &mpic 2 1 | ||
166 | 2800 0 0 2 &mpic 3 1 | ||
167 | 2800 0 0 3 &mpic 4 1 | ||
168 | 2800 0 0 4 &mpic 1 1 | ||
169 | |||
170 | /* IDSEL 12 */ | ||
171 | 6000 0 0 1 &mpic 1 1 | ||
172 | 6000 0 0 2 &mpic 2 1 | ||
173 | 6000 0 0 3 &mpic 3 1 | ||
174 | 6000 0 0 4 &mpic 4 1 | ||
175 | |||
176 | /* IDSEL 13 */ | ||
177 | 6800 0 0 1 &mpic 4 1 | ||
178 | 6800 0 0 2 &mpic 1 1 | ||
179 | 6800 0 0 3 &mpic 2 1 | ||
180 | 6800 0 0 4 &mpic 3 1 | ||
181 | |||
182 | /* IDSEL 14*/ | ||
183 | 7000 0 0 1 &mpic 3 1 | ||
184 | 7000 0 0 2 &mpic 4 1 | ||
185 | 7000 0 0 3 &mpic 1 1 | ||
186 | 7000 0 0 4 &mpic 2 1 | ||
187 | |||
188 | /* IDSEL 15 */ | ||
189 | 7800 0 0 1 &mpic 2 1 | ||
190 | 7800 0 0 2 &mpic 3 1 | ||
191 | 7800 0 0 3 &mpic 4 1 | ||
192 | 7800 0 0 4 &mpic 1 1 | ||
193 | |||
194 | /* IDSEL 18 */ | ||
195 | 9000 0 0 1 &mpic 1 1 | ||
196 | 9000 0 0 2 &mpic 2 1 | ||
197 | 9000 0 0 3 &mpic 3 1 | ||
198 | 9000 0 0 4 &mpic 4 1 | ||
199 | |||
200 | /* IDSEL 19 */ | ||
201 | 9800 0 0 1 &mpic 4 1 | ||
202 | 9800 0 0 2 &mpic 1 1 | ||
203 | 9800 0 0 3 &mpic 2 1 | ||
204 | 9800 0 0 4 &mpic 3 1 | ||
205 | |||
206 | /* IDSEL 20 */ | ||
207 | a000 0 0 1 &mpic 3 1 | ||
208 | a000 0 0 2 &mpic 4 1 | ||
209 | a000 0 0 3 &mpic 1 1 | ||
210 | a000 0 0 4 &mpic 2 1 | ||
211 | |||
212 | /* IDSEL 21 */ | ||
213 | a800 0 0 1 &mpic 2 1 | ||
214 | a800 0 0 2 &mpic 3 1 | ||
215 | a800 0 0 3 &mpic 4 1 | ||
216 | a800 0 0 4 &mpic 1 1>; | ||
217 | |||
218 | interrupt-parent = <&mpic>; | ||
219 | interrupts = <18 2>; | ||
220 | bus-range = <0 0>; | ||
221 | ranges = <02000000 0 80000000 80000000 0 20000000 | ||
222 | 01000000 0 00000000 e2000000 0 01000000>; | ||
223 | }; | ||
224 | |||
225 | mpic: pic@40000 { | 133 | mpic: pic@40000 { |
226 | interrupt-controller; | 134 | interrupt-controller; |
227 | #address-cells = <0>; | 135 | #address-cells = <0>; |
228 | #interrupt-cells = <2>; | 136 | #interrupt-cells = <2>; |
229 | reg = <40000 40000>; | 137 | reg = <40000 40000>; |
230 | built-in; | ||
231 | device_type = "open-pic"; | 138 | device_type = "open-pic"; |
232 | }; | 139 | }; |
233 | 140 | ||
234 | cpm@e0000000 { | 141 | cpm@919c0 { |
235 | #address-cells = <1>; | 142 | #address-cells = <1>; |
236 | #size-cells = <1>; | 143 | #size-cells = <1>; |
237 | #interrupt-cells = <2>; | 144 | compatible = "fsl,mpc8560-cpm", "fsl,cpm2"; |
238 | device_type = "cpm"; | 145 | reg = <919c0 30>; |
239 | model = "CPM2"; | 146 | ranges; |
240 | ranges = <0 0 c0000>; | 147 | |
241 | reg = <80000 40000>; | 148 | muram@80000 { |
242 | command-proc = <919c0>; | 149 | #address-cells = <1>; |
243 | brg-frequency = <9d5b340>; | 150 | #size-cells = <1>; |
151 | ranges = <0 80000 10000>; | ||
152 | |||
153 | data@0 { | ||
154 | compatible = "fsl,cpm-muram-data"; | ||
155 | reg = <0 4000 9000 2000>; | ||
156 | }; | ||
157 | }; | ||
158 | |||
159 | brg@919f0 { | ||
160 | compatible = "fsl,mpc8560-brg", | ||
161 | "fsl,cpm2-brg", | ||
162 | "fsl,cpm-brg"; | ||
163 | reg = <919f0 10 915f0 10>; | ||
164 | clock-frequency = <d#165000000>; | ||
165 | }; | ||
244 | 166 | ||
245 | cpmpic: pic@90c00 { | 167 | cpmpic: pic@90c00 { |
246 | interrupt-controller; | 168 | interrupt-controller; |
@@ -249,44 +171,38 @@ | |||
249 | interrupts = <2e 2>; | 171 | interrupts = <2e 2>; |
250 | interrupt-parent = <&mpic>; | 172 | interrupt-parent = <&mpic>; |
251 | reg = <90c00 80>; | 173 | reg = <90c00 80>; |
252 | built-in; | 174 | compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic"; |
253 | device_type = "cpm-pic"; | ||
254 | }; | 175 | }; |
255 | 176 | ||
256 | scc@91a00 { | 177 | serial@91a00 { |
257 | device_type = "serial"; | 178 | device_type = "serial"; |
258 | compatible = "cpm_uart"; | 179 | compatible = "fsl,mpc8560-scc-uart", |
259 | model = "SCC"; | 180 | "fsl,cpm2-scc-uart"; |
260 | device-id = <1>; | ||
261 | reg = <91a00 20 88000 100>; | 181 | reg = <91a00 20 88000 100>; |
262 | clock-setup = <00ffffff 0>; | 182 | fsl,cpm-brg = <1>; |
263 | rx-clock = <1>; | 183 | fsl,cpm-command = <00800000>; |
264 | tx-clock = <1>; | ||
265 | current-speed = <1c200>; | 184 | current-speed = <1c200>; |
266 | interrupts = <28 8>; | 185 | interrupts = <28 8>; |
267 | interrupt-parent = <&cpmpic>; | 186 | interrupt-parent = <&cpmpic>; |
268 | }; | 187 | }; |
269 | 188 | ||
270 | scc@91a20 { | 189 | serial@91a20 { |
271 | device_type = "serial"; | 190 | device_type = "serial"; |
272 | compatible = "cpm_uart"; | 191 | compatible = "fsl,mpc8560-scc-uart", |
273 | model = "SCC"; | 192 | "fsl,cpm2-scc-uart"; |
274 | device-id = <2>; | ||
275 | reg = <91a20 20 88100 100>; | 193 | reg = <91a20 20 88100 100>; |
276 | clock-setup = <ff00ffff 90000>; | 194 | fsl,cpm-brg = <2>; |
277 | rx-clock = <2>; | 195 | fsl,cpm-command = <04a00000>; |
278 | tx-clock = <2>; | ||
279 | current-speed = <1c200>; | 196 | current-speed = <1c200>; |
280 | interrupts = <29 8>; | 197 | interrupts = <29 8>; |
281 | interrupt-parent = <&cpmpic>; | 198 | interrupt-parent = <&cpmpic>; |
282 | }; | 199 | }; |
283 | 200 | ||
284 | fcc@91320 { | 201 | ethernet@91320 { |
285 | device_type = "network"; | 202 | device_type = "network"; |
286 | compatible = "fs_enet"; | 203 | compatible = "fsl,mpc8560-fcc-enet", |
287 | model = "FCC"; | 204 | "fsl,cpm2-fcc-enet"; |
288 | device-id = <2>; | 205 | reg = <91320 20 88500 100 913b0 1>; |
289 | reg = <91320 20 88500 100 913a0 30>; | ||
290 | /* | 206 | /* |
291 | * mac-address is deprecated and will be removed | 207 | * mac-address is deprecated and will be removed |
292 | * in 2.6.25. Only recent versions of | 208 | * in 2.6.25. Only recent versions of |
@@ -294,20 +210,17 @@ | |||
294 | */ | 210 | */ |
295 | mac-address = [ 00 00 00 00 00 00 ]; | 211 | mac-address = [ 00 00 00 00 00 00 ]; |
296 | local-mac-address = [ 00 00 00 00 00 00 ]; | 212 | local-mac-address = [ 00 00 00 00 00 00 ]; |
297 | clock-setup = <ff00ffff 250000>; | 213 | fsl,cpm-command = <16200300>; |
298 | rx-clock = <15>; | ||
299 | tx-clock = <16>; | ||
300 | interrupts = <21 8>; | 214 | interrupts = <21 8>; |
301 | interrupt-parent = <&cpmpic>; | 215 | interrupt-parent = <&cpmpic>; |
302 | phy-handle = <&phy2>; | 216 | phy-handle = <&phy2>; |
303 | }; | 217 | }; |
304 | 218 | ||
305 | fcc@91340 { | 219 | ethernet@91340 { |
306 | device_type = "network"; | 220 | device_type = "network"; |
307 | compatible = "fs_enet"; | 221 | compatible = "fsl,mpc8560-fcc-enet", |
308 | model = "FCC"; | 222 | "fsl,cpm2-fcc-enet"; |
309 | device-id = <3>; | 223 | reg = <91340 20 88600 100 913d0 1>; |
310 | reg = <91340 20 88600 100 913d0 30>; | ||
311 | /* | 224 | /* |
312 | * mac-address is deprecated and will be removed | 225 | * mac-address is deprecated and will be removed |
313 | * in 2.6.25. Only recent versions of | 226 | * in 2.6.25. Only recent versions of |
@@ -315,13 +228,101 @@ | |||
315 | */ | 228 | */ |
316 | mac-address = [ 00 00 00 00 00 00 ]; | 229 | mac-address = [ 00 00 00 00 00 00 ]; |
317 | local-mac-address = [ 00 00 00 00 00 00 ]; | 230 | local-mac-address = [ 00 00 00 00 00 00 ]; |
318 | clock-setup = <ffff00ff 3700>; | 231 | fsl,cpm-command = <1a400300>; |
319 | rx-clock = <17>; | ||
320 | tx-clock = <18>; | ||
321 | interrupts = <22 8>; | 232 | interrupts = <22 8>; |
322 | interrupt-parent = <&cpmpic>; | 233 | interrupt-parent = <&cpmpic>; |
323 | phy-handle = <&phy3>; | 234 | phy-handle = <&phy3>; |
324 | }; | 235 | }; |
325 | }; | 236 | }; |
326 | }; | 237 | }; |
238 | |||
239 | pci@e0008000 { | ||
240 | #interrupt-cells = <1>; | ||
241 | #size-cells = <2>; | ||
242 | #address-cells = <3>; | ||
243 | compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci"; | ||
244 | device_type = "pci"; | ||
245 | reg = <e0008000 1000>; | ||
246 | clock-frequency = <3f940aa>; | ||
247 | interrupt-map-mask = <f800 0 0 7>; | ||
248 | interrupt-map = < | ||
249 | |||
250 | /* IDSEL 0x2 */ | ||
251 | 1000 0 0 1 &mpic 1 1 | ||
252 | 1000 0 0 2 &mpic 2 1 | ||
253 | 1000 0 0 3 &mpic 3 1 | ||
254 | 1000 0 0 4 &mpic 4 1 | ||
255 | |||
256 | /* IDSEL 0x3 */ | ||
257 | 1800 0 0 1 &mpic 4 1 | ||
258 | 1800 0 0 2 &mpic 1 1 | ||
259 | 1800 0 0 3 &mpic 2 1 | ||
260 | 1800 0 0 4 &mpic 3 1 | ||
261 | |||
262 | /* IDSEL 0x4 */ | ||
263 | 2000 0 0 1 &mpic 3 1 | ||
264 | 2000 0 0 2 &mpic 4 1 | ||
265 | 2000 0 0 3 &mpic 1 1 | ||
266 | 2000 0 0 4 &mpic 2 1 | ||
267 | |||
268 | /* IDSEL 0x5 */ | ||
269 | 2800 0 0 1 &mpic 2 1 | ||
270 | 2800 0 0 2 &mpic 3 1 | ||
271 | 2800 0 0 3 &mpic 4 1 | ||
272 | 2800 0 0 4 &mpic 1 1 | ||
273 | |||
274 | /* IDSEL 12 */ | ||
275 | 6000 0 0 1 &mpic 1 1 | ||
276 | 6000 0 0 2 &mpic 2 1 | ||
277 | 6000 0 0 3 &mpic 3 1 | ||
278 | 6000 0 0 4 &mpic 4 1 | ||
279 | |||
280 | /* IDSEL 13 */ | ||
281 | 6800 0 0 1 &mpic 4 1 | ||
282 | 6800 0 0 2 &mpic 1 1 | ||
283 | 6800 0 0 3 &mpic 2 1 | ||
284 | 6800 0 0 4 &mpic 3 1 | ||
285 | |||
286 | /* IDSEL 14*/ | ||
287 | 7000 0 0 1 &mpic 3 1 | ||
288 | 7000 0 0 2 &mpic 4 1 | ||
289 | 7000 0 0 3 &mpic 1 1 | ||
290 | 7000 0 0 4 &mpic 2 1 | ||
291 | |||
292 | /* IDSEL 15 */ | ||
293 | 7800 0 0 1 &mpic 2 1 | ||
294 | 7800 0 0 2 &mpic 3 1 | ||
295 | 7800 0 0 3 &mpic 4 1 | ||
296 | 7800 0 0 4 &mpic 1 1 | ||
297 | |||
298 | /* IDSEL 18 */ | ||
299 | 9000 0 0 1 &mpic 1 1 | ||
300 | 9000 0 0 2 &mpic 2 1 | ||
301 | 9000 0 0 3 &mpic 3 1 | ||
302 | 9000 0 0 4 &mpic 4 1 | ||
303 | |||
304 | /* IDSEL 19 */ | ||
305 | 9800 0 0 1 &mpic 4 1 | ||
306 | 9800 0 0 2 &mpic 1 1 | ||
307 | 9800 0 0 3 &mpic 2 1 | ||
308 | 9800 0 0 4 &mpic 3 1 | ||
309 | |||
310 | /* IDSEL 20 */ | ||
311 | a000 0 0 1 &mpic 3 1 | ||
312 | a000 0 0 2 &mpic 4 1 | ||
313 | a000 0 0 3 &mpic 1 1 | ||
314 | a000 0 0 4 &mpic 2 1 | ||
315 | |||
316 | /* IDSEL 21 */ | ||
317 | a800 0 0 1 &mpic 2 1 | ||
318 | a800 0 0 2 &mpic 3 1 | ||
319 | a800 0 0 3 &mpic 4 1 | ||
320 | a800 0 0 4 &mpic 1 1>; | ||
321 | |||
322 | interrupt-parent = <&mpic>; | ||
323 | interrupts = <18 2>; | ||
324 | bus-range = <0 0>; | ||
325 | ranges = <02000000 0 80000000 80000000 0 20000000 | ||
326 | 01000000 0 00000000 e2000000 0 01000000>; | ||
327 | }; | ||
327 | }; | 328 | }; |