diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-09 16:34:25 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-09 16:34:25 -0400 |
commit | f974a8ec96571535ee07880a023bcce0e3f2c76b (patch) | |
tree | 5cf09207b1ad292a55275cd0b24999fa29b9dfe8 /arch/powerpc/boot/dts/mpc8377_mds.dts | |
parent | c0b8556f2f8146bd38324b14b1ce00f249ba8ed9 (diff) | |
parent | 4ed47896935573c8423d05bddda3f269d6e6c613 (diff) |
Merge branch 'machtypes' into pxa-palm
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8377_mds.dts')
-rw-r--r-- | arch/powerpc/boot/dts/mpc8377_mds.dts | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts index 1e7802cc31ae..fea592574004 100644 --- a/arch/powerpc/boot/dts/mpc8377_mds.dts +++ b/arch/powerpc/boot/dts/mpc8377_mds.dts | |||
@@ -271,27 +271,35 @@ | |||
271 | dma@82a8 { | 271 | dma@82a8 { |
272 | #address-cells = <1>; | 272 | #address-cells = <1>; |
273 | #size-cells = <1>; | 273 | #size-cells = <1>; |
274 | compatible = "fsl,mpc8349-dma"; | 274 | compatible = "fsl,mpc8377-dma", "fsl,elo-dma"; |
275 | reg = <0x82a8 4>; | 275 | reg = <0x82a8 4>; |
276 | ranges = <0 0x8100 0x1a8>; | 276 | ranges = <0 0x8100 0x1a8>; |
277 | interrupt-parent = <&ipic>; | 277 | interrupt-parent = <&ipic>; |
278 | interrupts = <0x47 8>; | 278 | interrupts = <0x47 8>; |
279 | cell-index = <0>; | 279 | cell-index = <0>; |
280 | dma-channel@0 { | 280 | dma-channel@0 { |
281 | compatible = "fsl,mpc8349-dma-channel"; | 281 | compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel"; |
282 | reg = <0 0x80>; | 282 | reg = <0 0x80>; |
283 | interrupt-parent = <&ipic>; | ||
284 | interrupts = <0x47 8>; | ||
283 | }; | 285 | }; |
284 | dma-channel@80 { | 286 | dma-channel@80 { |
285 | compatible = "fsl,mpc8349-dma-channel"; | 287 | compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel"; |
286 | reg = <0x80 0x80>; | 288 | reg = <0x80 0x80>; |
289 | interrupt-parent = <&ipic>; | ||
290 | interrupts = <0x47 8>; | ||
287 | }; | 291 | }; |
288 | dma-channel@100 { | 292 | dma-channel@100 { |
289 | compatible = "fsl,mpc8349-dma-channel"; | 293 | compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel"; |
290 | reg = <0x100 0x80>; | 294 | reg = <0x100 0x80>; |
295 | interrupt-parent = <&ipic>; | ||
296 | interrupts = <0x47 8>; | ||
291 | }; | 297 | }; |
292 | dma-channel@180 { | 298 | dma-channel@180 { |
293 | compatible = "fsl,mpc8349-dma-channel"; | 299 | compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel"; |
294 | reg = <0x180 0x28>; | 300 | reg = <0x180 0x28>; |
301 | interrupt-parent = <&ipic>; | ||
302 | interrupts = <0x47 8>; | ||
295 | }; | 303 | }; |
296 | }; | 304 | }; |
297 | 305 | ||