diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-10 23:10:08 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-10 23:10:08 -0500 |
| commit | eed0ba0b4ab2d1668588219a8efa81bf8636a12d (patch) | |
| tree | f5aa3c732e7830a1b24e6071f8bed0f799881187 /arch/powerpc/boot | |
| parent | 98b14d6b290d96b24ae993ceaccc59b2aa4b130c (diff) | |
| parent | c9de9333f5a860cab82052bce6ac28bcac9b2c26 (diff) | |
Merge remote branch 'gcl/next' into next
Diffstat (limited to 'arch/powerpc/boot')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8308_p1m.dts | 8 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8308rdb.dts | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/mpc8308_p1m.dts b/arch/powerpc/boot/dts/mpc8308_p1m.dts index 05a76ccfd499..697b3f6b78bf 100644 --- a/arch/powerpc/boot/dts/mpc8308_p1m.dts +++ b/arch/powerpc/boot/dts/mpc8308_p1m.dts | |||
| @@ -297,6 +297,14 @@ | |||
| 297 | interrupt-parent = < &ipic >; | 297 | interrupt-parent = < &ipic >; |
| 298 | }; | 298 | }; |
| 299 | 299 | ||
| 300 | dma@2c000 { | ||
| 301 | compatible = "fsl,mpc8308-dma", "fsl,mpc5121-dma"; | ||
| 302 | reg = <0x2c000 0x1800>; | ||
| 303 | interrupts = <3 0x8 | ||
| 304 | 94 0x8>; | ||
| 305 | interrupt-parent = < &ipic >; | ||
| 306 | }; | ||
| 307 | |||
| 300 | }; | 308 | }; |
| 301 | 309 | ||
| 302 | pci0: pcie@e0009000 { | 310 | pci0: pcie@e0009000 { |
diff --git a/arch/powerpc/boot/dts/mpc8308rdb.dts b/arch/powerpc/boot/dts/mpc8308rdb.dts index a97eb2db5a18..d3db02f98ddd 100644 --- a/arch/powerpc/boot/dts/mpc8308rdb.dts +++ b/arch/powerpc/boot/dts/mpc8308rdb.dts | |||
| @@ -265,6 +265,14 @@ | |||
| 265 | interrupt-parent = < &ipic >; | 265 | interrupt-parent = < &ipic >; |
| 266 | }; | 266 | }; |
| 267 | 267 | ||
| 268 | dma@2c000 { | ||
| 269 | compatible = "fsl,mpc8308-dma", "fsl,mpc5121-dma"; | ||
| 270 | reg = <0x2c000 0x1800>; | ||
| 271 | interrupts = <3 0x8 | ||
| 272 | 94 0x8>; | ||
| 273 | interrupt-parent = < &ipic >; | ||
| 274 | }; | ||
| 275 | |||
| 268 | }; | 276 | }; |
| 269 | 277 | ||
| 270 | pci0: pcie@e0009000 { | 278 | pci0: pcie@e0009000 { |