diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2008-06-27 14:45:19 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-06-27 17:04:29 -0400 |
commit | dee805532a30183c4462305b4614e58bd83a7bc1 (patch) | |
tree | 58cf510b5dfe47c29db0b1a660384f67ea396a61 /arch/powerpc/boot/dts/mpc832x_rdb.dts | |
parent | f82796214a95b1ec00c2f121c1080d10f2b099a1 (diff) |
powerpc: Add dma nodes to 83xx, 85xx and 86xx boards
Added DMA nodes for the elo/elo-plus DMA engines.
Renamed the interrupt controller alias in mpc832x_rdb.dts to ipic so that
its the same as all the other boards.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot/dts/mpc832x_rdb.dts')
-rw-r--r-- | arch/powerpc/boot/dts/mpc832x_rdb.dts | 71 |
1 files changed, 53 insertions, 18 deletions
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts index 179c81c6a7ac..a798d8639a7d 100644 --- a/arch/powerpc/boot/dts/mpc832x_rdb.dts +++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts | |||
@@ -68,7 +68,7 @@ | |||
68 | compatible = "fsl-i2c"; | 68 | compatible = "fsl-i2c"; |
69 | reg = <0x3000 0x100>; | 69 | reg = <0x3000 0x100>; |
70 | interrupts = <14 0x8>; | 70 | interrupts = <14 0x8>; |
71 | interrupt-parent = <&pic>; | 71 | interrupt-parent = <&ipic>; |
72 | dfsrr; | 72 | dfsrr; |
73 | }; | 73 | }; |
74 | 74 | ||
@@ -79,7 +79,7 @@ | |||
79 | reg = <0x4500 0x100>; | 79 | reg = <0x4500 0x100>; |
80 | clock-frequency = <0>; | 80 | clock-frequency = <0>; |
81 | interrupts = <9 0x8>; | 81 | interrupts = <9 0x8>; |
82 | interrupt-parent = <&pic>; | 82 | interrupt-parent = <&ipic>; |
83 | }; | 83 | }; |
84 | 84 | ||
85 | serial1: serial@4600 { | 85 | serial1: serial@4600 { |
@@ -89,7 +89,42 @@ | |||
89 | reg = <0x4600 0x100>; | 89 | reg = <0x4600 0x100>; |
90 | clock-frequency = <0>; | 90 | clock-frequency = <0>; |
91 | interrupts = <10 0x8>; | 91 | interrupts = <10 0x8>; |
92 | interrupt-parent = <&pic>; | 92 | interrupt-parent = <&ipic>; |
93 | }; | ||
94 | |||
95 | dma@82a8 { | ||
96 | #address-cells = <1>; | ||
97 | #size-cells = <1>; | ||
98 | compatible = "fsl,mpc8323-dma", "fsl,elo-dma"; | ||
99 | reg = <0x82a8 4>; | ||
100 | ranges = <0 0x8100 0x1a8>; | ||
101 | interrupt-parent = <&ipic>; | ||
102 | interrupts = <71 8>; | ||
103 | cell-index = <0>; | ||
104 | dma-channel@0 { | ||
105 | compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel"; | ||
106 | reg = <0 0x80>; | ||
107 | interrupt-parent = <&ipic>; | ||
108 | interrupts = <71 8>; | ||
109 | }; | ||
110 | dma-channel@80 { | ||
111 | compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel"; | ||
112 | reg = <0x80 0x80>; | ||
113 | interrupt-parent = <&ipic>; | ||
114 | interrupts = <71 8>; | ||
115 | }; | ||
116 | dma-channel@100 { | ||
117 | compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel"; | ||
118 | reg = <0x100 0x80>; | ||
119 | interrupt-parent = <&ipic>; | ||
120 | interrupts = <71 8>; | ||
121 | }; | ||
122 | dma-channel@180 { | ||
123 | compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel"; | ||
124 | reg = <0x180 0x28>; | ||
125 | interrupt-parent = <&ipic>; | ||
126 | interrupts = <71 8>; | ||
127 | }; | ||
93 | }; | 128 | }; |
94 | 129 | ||
95 | crypto@30000 { | 130 | crypto@30000 { |
@@ -98,7 +133,7 @@ | |||
98 | compatible = "talitos"; | 133 | compatible = "talitos"; |
99 | reg = <0x30000 0x7000>; | 134 | reg = <0x30000 0x7000>; |
100 | interrupts = <11 0x8>; | 135 | interrupts = <11 0x8>; |
101 | interrupt-parent = <&pic>; | 136 | interrupt-parent = <&ipic>; |
102 | /* Rev. 2.2 */ | 137 | /* Rev. 2.2 */ |
103 | num-channels = <1>; | 138 | num-channels = <1>; |
104 | channel-fifo-len = <24>; | 139 | channel-fifo-len = <24>; |
@@ -106,7 +141,7 @@ | |||
106 | descriptor-types-mask = <0x0122003f>; | 141 | descriptor-types-mask = <0x0122003f>; |
107 | }; | 142 | }; |
108 | 143 | ||
109 | pic:pic@700 { | 144 | ipic:pic@700 { |
110 | interrupt-controller; | 145 | interrupt-controller; |
111 | #address-cells = <0>; | 146 | #address-cells = <0>; |
112 | #interrupt-cells = <2>; | 147 | #interrupt-cells = <2>; |
@@ -240,13 +275,13 @@ | |||
240 | compatible = "fsl,ucc-mdio"; | 275 | compatible = "fsl,ucc-mdio"; |
241 | 276 | ||
242 | phy00:ethernet-phy@00 { | 277 | phy00:ethernet-phy@00 { |
243 | interrupt-parent = <&pic>; | 278 | interrupt-parent = <&ipic>; |
244 | interrupts = <0>; | 279 | interrupts = <0>; |
245 | reg = <0x0>; | 280 | reg = <0x0>; |
246 | device_type = "ethernet-phy"; | 281 | device_type = "ethernet-phy"; |
247 | }; | 282 | }; |
248 | phy04:ethernet-phy@04 { | 283 | phy04:ethernet-phy@04 { |
249 | interrupt-parent = <&pic>; | 284 | interrupt-parent = <&ipic>; |
250 | interrupts = <0>; | 285 | interrupts = <0>; |
251 | reg = <0x4>; | 286 | reg = <0x4>; |
252 | device_type = "ethernet-phy"; | 287 | device_type = "ethernet-phy"; |
@@ -261,7 +296,7 @@ | |||
261 | reg = <0x80 0x80>; | 296 | reg = <0x80 0x80>; |
262 | big-endian; | 297 | big-endian; |
263 | interrupts = <32 0x8 33 0x8>; //high:32 low:33 | 298 | interrupts = <32 0x8 33 0x8>; //high:32 low:33 |
264 | interrupt-parent = <&pic>; | 299 | interrupt-parent = <&ipic>; |
265 | }; | 300 | }; |
266 | }; | 301 | }; |
267 | 302 | ||
@@ -270,21 +305,21 @@ | |||
270 | interrupt-map-mask = <0xf800 0x0 0x0 0x7>; | 305 | interrupt-map-mask = <0xf800 0x0 0x0 0x7>; |
271 | interrupt-map = < | 306 | interrupt-map = < |
272 | /* IDSEL 0x10 AD16 (USB) */ | 307 | /* IDSEL 0x10 AD16 (USB) */ |
273 | 0x8000 0x0 0x0 0x1 &pic 17 0x8 | 308 | 0x8000 0x0 0x0 0x1 &ipic 17 0x8 |
274 | 309 | ||
275 | /* IDSEL 0x11 AD17 (Mini1)*/ | 310 | /* IDSEL 0x11 AD17 (Mini1)*/ |
276 | 0x8800 0x0 0x0 0x1 &pic 18 0x8 | 311 | 0x8800 0x0 0x0 0x1 &ipic 18 0x8 |
277 | 0x8800 0x0 0x0 0x2 &pic 19 0x8 | 312 | 0x8800 0x0 0x0 0x2 &ipic 19 0x8 |
278 | 0x8800 0x0 0x0 0x3 &pic 20 0x8 | 313 | 0x8800 0x0 0x0 0x3 &ipic 20 0x8 |
279 | 0x8800 0x0 0x0 0x4 &pic 48 0x8 | 314 | 0x8800 0x0 0x0 0x4 &ipic 48 0x8 |
280 | 315 | ||
281 | /* IDSEL 0x12 AD18 (PCI/Mini2) */ | 316 | /* IDSEL 0x12 AD18 (PCI/Mini2) */ |
282 | 0x9000 0x0 0x0 0x1 &pic 19 0x8 | 317 | 0x9000 0x0 0x0 0x1 &ipic 19 0x8 |
283 | 0x9000 0x0 0x0 0x2 &pic 20 0x8 | 318 | 0x9000 0x0 0x0 0x2 &ipic 20 0x8 |
284 | 0x9000 0x0 0x0 0x3 &pic 48 0x8 | 319 | 0x9000 0x0 0x0 0x3 &ipic 48 0x8 |
285 | 0x9000 0x0 0x0 0x4 &pic 17 0x8>; | 320 | 0x9000 0x0 0x0 0x4 &ipic 17 0x8>; |
286 | 321 | ||
287 | interrupt-parent = <&pic>; | 322 | interrupt-parent = <&ipic>; |
288 | interrupts = <66 0x8>; | 323 | interrupts = <66 0x8>; |
289 | bus-range = <0x0 0x0>; | 324 | bus-range = <0x0 0x0>; |
290 | ranges = <0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000 | 325 | ranges = <0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000 |