diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-30 21:37:27 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-30 21:37:27 -0500 |
commit | 8af03e782cae1e0a0f530ddd22301cdd12cf9dc0 (patch) | |
tree | c4af13a38bd3cc1a811a37f2358491f171052070 /arch/powerpc/boot/dts/bamboo.dts | |
parent | 6232665040f9a23fafd9d94d4ae8d5a2dc850f65 (diff) | |
parent | 99e139126ab2e84be67969650f92eb37c12ab5cd (diff) |
Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (454 commits)
[POWERPC] Cell IOMMU fixed mapping support
[POWERPC] Split out the ioid fetching/checking logic
[POWERPC] Add support to cell_iommu_setup_page_tables() for multiple windows
[POWERPC] Split out the IOMMU logic from cell_dma_dev_setup()
[POWERPC] Split cell_iommu_setup_hardware() into two parts
[POWERPC] Split out the logic that allocates struct iommus
[POWERPC] Allocate the hash table under 1G on cell
[POWERPC] Add set_dma_ops() to match get_dma_ops()
[POWERPC] 83xx: Clean up / convert mpc83xx board DTS files to v1 format.
[POWERPC] 85xx: Only invalidate TLB0 and TLB1
[POWERPC] 83xx: Fix typo in mpc837x compatible entries
[POWERPC] 85xx: convert sbc85* boards to use machine_device_initcall
[POWERPC] 83xx: rework platform Kconfig
[POWERPC] 85xx: rework platform Kconfig
[POWERPC] 86xx: Remove unused IRQ defines
[POWERPC] QE: Explicitly set address-cells and size cells for muram
[POWERPC] Convert StorCenter DTS file to /dts-v1/ format.
[POWERPC] 86xx: Convert all 86xx DTS files to /dts-v1/ format.
[PPC] Remove 85xx from arch/ppc
[PPC] Remove 83xx from arch/ppc
...
Diffstat (limited to 'arch/powerpc/boot/dts/bamboo.dts')
-rw-r--r-- | arch/powerpc/boot/dts/bamboo.dts | 62 |
1 files changed, 58 insertions, 4 deletions
diff --git a/arch/powerpc/boot/dts/bamboo.dts b/arch/powerpc/boot/dts/bamboo.dts index cb2fb50a281c..29f1a6f3e373 100644 --- a/arch/powerpc/boot/dts/bamboo.dts +++ b/arch/powerpc/boot/dts/bamboo.dts | |||
@@ -16,14 +16,24 @@ | |||
16 | #size-cells = <1>; | 16 | #size-cells = <1>; |
17 | model = "amcc,bamboo"; | 17 | model = "amcc,bamboo"; |
18 | compatible = "amcc,bamboo"; | 18 | compatible = "amcc,bamboo"; |
19 | dcr-parent = <&/cpus/PowerPC,440EP@0>; | 19 | dcr-parent = <&/cpus/cpu@0>; |
20 | |||
21 | aliases { | ||
22 | ethernet0 = &EMAC0; | ||
23 | ethernet1 = &EMAC1; | ||
24 | serial0 = &UART0; | ||
25 | serial1 = &UART1; | ||
26 | serial2 = &UART2; | ||
27 | serial3 = &UART3; | ||
28 | }; | ||
20 | 29 | ||
21 | cpus { | 30 | cpus { |
22 | #address-cells = <1>; | 31 | #address-cells = <1>; |
23 | #size-cells = <0>; | 32 | #size-cells = <0>; |
24 | 33 | ||
25 | PowerPC,440EP@0 { | 34 | cpu@0 { |
26 | device_type = "cpu"; | 35 | device_type = "cpu"; |
36 | model = "PowerPC,440EP"; | ||
27 | reg = <0>; | 37 | reg = <0>; |
28 | clock-frequency = <0>; /* Filled in by zImage */ | 38 | clock-frequency = <0>; /* Filled in by zImage */ |
29 | timebase-frequency = <0>; /* Filled in by zImage */ | 39 | timebase-frequency = <0>; /* Filled in by zImage */ |
@@ -126,7 +136,6 @@ | |||
126 | #address-cells = <2>; | 136 | #address-cells = <2>; |
127 | #size-cells = <1>; | 137 | #size-cells = <1>; |
128 | clock-frequency = <0>; /* Filled in by zImage */ | 138 | clock-frequency = <0>; /* Filled in by zImage */ |
129 | ranges; | ||
130 | interrupts = <5 1>; | 139 | interrupts = <5 1>; |
131 | interrupt-parent = <&UIC1>; | 140 | interrupt-parent = <&UIC1>; |
132 | }; | 141 | }; |
@@ -238,11 +247,56 @@ | |||
238 | zmii-device = <&ZMII0>; | 247 | zmii-device = <&ZMII0>; |
239 | zmii-channel = <1>; | 248 | zmii-channel = <1>; |
240 | }; | 249 | }; |
250 | |||
251 | usb@ef601000 { | ||
252 | compatible = "ohci-be"; | ||
253 | reg = <ef601000 80>; | ||
254 | interrupts = <8 1 9 1>; | ||
255 | interrupt-parent = < &UIC1 >; | ||
256 | }; | ||
257 | }; | ||
258 | |||
259 | PCI0: pci@ec000000 { | ||
260 | device_type = "pci"; | ||
261 | #interrupt-cells = <1>; | ||
262 | #size-cells = <2>; | ||
263 | #address-cells = <3>; | ||
264 | compatible = "ibm,plb440ep-pci", "ibm,plb-pci"; | ||
265 | primary; | ||
266 | reg = <0 eec00000 8 /* Config space access */ | ||
267 | 0 eed00000 4 /* IACK */ | ||
268 | 0 eed00000 4 /* Special cycle */ | ||
269 | 0 ef400000 40>; /* Internal registers */ | ||
270 | |||
271 | /* Outbound ranges, one memory and one IO, | ||
272 | * later cannot be changed. Chip supports a second | ||
273 | * IO range but we don't use it for now | ||
274 | */ | ||
275 | ranges = <02000000 0 a0000000 0 a0000000 0 20000000 | ||
276 | 01000000 0 00000000 0 e8000000 0 00010000>; | ||
277 | |||
278 | /* Inbound 2GB range starting at 0 */ | ||
279 | dma-ranges = <42000000 0 0 0 0 0 80000000>; | ||
280 | |||
281 | /* Bamboo has all 4 IRQ pins tied together per slot */ | ||
282 | interrupt-map-mask = <f800 0 0 0>; | ||
283 | interrupt-map = < | ||
284 | /* IDSEL 1 */ | ||
285 | 0800 0 0 0 &UIC0 1c 8 | ||
286 | |||
287 | /* IDSEL 2 */ | ||
288 | 1000 0 0 0 &UIC0 1b 8 | ||
289 | |||
290 | /* IDSEL 3 */ | ||
291 | 1800 0 0 0 &UIC0 1a 8 | ||
292 | |||
293 | /* IDSEL 4 */ | ||
294 | 2000 0 0 0 &UIC0 19 8 | ||
295 | >; | ||
241 | }; | 296 | }; |
242 | }; | 297 | }; |
243 | 298 | ||
244 | chosen { | 299 | chosen { |
245 | linux,stdout-path = "/plb/opb/serial@ef600300"; | 300 | linux,stdout-path = "/plb/opb/serial@ef600300"; |
246 | bootargs = "console=ttyS0,115200"; | ||
247 | }; | 301 | }; |
248 | }; | 302 | }; |