Skip to content

Commit dee8055

Browse files
kumargalakumargala
committed
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 <[email protected]>
1 parent f827962 commit dee8055

36 files changed

+1433
-53
lines changed

‎arch/powerpc/boot/dts/asp834x-redboot.dts

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,41 @@
118118
mode = "cpu";
119119
};
120120

121+
dma@82a8 {
122+
#address-cells = <1>;
123+
#size-cells = <1>;
124+
compatible = "fsl,mpc8347-dma", "fsl,elo-dma";
125+
reg = <0x82a8 4>;
126+
ranges = <0 0x8100 0x1a8>;
127+
interrupt-parent = <&ipic>;
128+
interrupts = <71 8>;
129+
cell-index = <0>;
130+
dma-channel@0 {
131+
compatible = "fsl,mpc8347-dma-channel", "fsl,elo-dma-channel";
132+
reg = <0 0x80>;
133+
interrupt-parent = <&ipic>;
134+
interrupts = <71 8>;
135+
};
136+
dma-channel@80 {
137+
compatible = "fsl,mpc8347-dma-channel", "fsl,elo-dma-channel";
138+
reg = <0x80 0x80>;
139+
interrupt-parent = <&ipic>;
140+
interrupts = <71 8>;
141+
};
142+
dma-channel@100 {
143+
compatible = "fsl,mpc8347-dma-channel", "fsl,elo-dma-channel";
144+
reg = <0x100 0x80>;
145+
interrupt-parent = <&ipic>;
146+
interrupts = <71 8>;
147+
};
148+
dma-channel@180 {
149+
compatible = "fsl,mpc8347-dma-channel", "fsl,elo-dma-channel";
150+
reg = <0x180 0x28>;
151+
interrupt-parent = <&ipic>;
152+
interrupts = <71 8>;
153+
};
154+
};
155+
121156
/* phy type (ULPI or SERIAL) are only types supported for MPH */
122157
/* port = 0 or 1 */
123158
usb@22000 {

‎arch/powerpc/boot/dts/ksi8560.dts

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,47 @@
8383
dfsrr;
8484
};
8585

86+
dma@21300 {
87+
#address-cells = <1>;
88+
#size-cells = <1>;
89+
compatible = "fsl,mpc8560-dma", "fsl,eloplus-dma";
90+
reg = <0x21300 0x4>;
91+
ranges = <0x0 0x21100 0x200>;
92+
cell-index = <0>;
93+
dma-channel@0 {
94+
compatible = "fsl,mpc8560-dma-channel",
95+
"fsl,eloplus-dma-channel";
96+
reg = <0x0 0x80>;
97+
cell-index = <0>;
98+
interrupt-parent = <&mpic>;
99+
interrupts = <20 2>;
100+
};
101+
dma-channel@80 {
102+
compatible = "fsl,mpc8560-dma-channel",
103+
"fsl,eloplus-dma-channel";
104+
reg = <0x80 0x80>;
105+
cell-index = <1>;
106+
interrupt-parent = <&mpic>;
107+
interrupts = <21 2>;
108+
};
109+
dma-channel@100 {
110+
compatible = "fsl,mpc8560-dma-channel",
111+
"fsl,eloplus-dma-channel";
112+
reg = <0x100 0x80>;
113+
cell-index = <2>;
114+
interrupt-parent = <&mpic>;
115+
interrupts = <22 2>;
116+
};
117+
dma-channel@180 {
118+
compatible = "fsl,mpc8560-dma-channel",
119+
"fsl,eloplus-dma-channel";
120+
reg = <0x180 0x80>;
121+
cell-index = <3>;
122+
interrupt-parent = <&mpic>;
123+
interrupts = <23 2>;
124+
};
125+
};
126+
86127
mdio@24520 { /* For TSECs */
87128
#address-cells = <1>;
88129
#size-cells = <0>;

‎arch/powerpc/boot/dts/mpc8313erdb.dts

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,41 @@
144144
mode = "cpu";
145145
};
146146

147+
dma@82a8 {
148+
#address-cells = <1>;
149+
#size-cells = <1>;
150+
compatible = "fsl,mpc8313-dma", "fsl,elo-dma";
151+
reg = <0x82a8 4>;
152+
ranges = <0 0x8100 0x1a8>;
153+
interrupt-parent = <&ipic>;
154+
interrupts = <71 8>;
155+
cell-index = <0>;
156+
dma-channel@0 {
157+
compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
158+
reg = <0 0x80>;
159+
interrupt-parent = <&ipic>;
160+
interrupts = <71 8>;
161+
};
162+
dma-channel@80 {
163+
compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
164+
reg = <0x80 0x80>;
165+
interrupt-parent = <&ipic>;
166+
interrupts = <71 8>;
167+
};
168+
dma-channel@100 {
169+
compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
170+
reg = <0x100 0x80>;
171+
interrupt-parent = <&ipic>;
172+
interrupts = <71 8>;
173+
};
174+
dma-channel@180 {
175+
compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
176+
reg = <0x180 0x28>;
177+
interrupt-parent = <&ipic>;
178+
interrupts = <71 8>;
179+
};
180+
};
181+
147182
/* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
148183
usb@23000 {
149184
compatible = "fsl-usb2-dr";

‎arch/powerpc/boot/dts/mpc8315erdb.dts

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,41 @@
132132
mode = "cpu";
133133
};
134134

135+
dma@82a8 {
136+
#address-cells = <1>;
137+
#size-cells = <1>;
138+
compatible = "fsl,mpc8315-dma", "fsl,elo-dma";
139+
reg = <0x82a8 4>;
140+
ranges = <0 0x8100 0x1a8>;
141+
interrupt-parent = <&ipic>;
142+
interrupts = <71 8>;
143+
cell-index = <0>;
144+
dma-channel@0 {
145+
compatible = "fsl,mpc8315-dma-channel", "fsl,elo-dma-channel";
146+
reg = <0 0x80>;
147+
interrupt-parent = <&ipic>;
148+
interrupts = <71 8>;
149+
};
150+
dma-channel@80 {
151+
compatible = "fsl,mpc8315-dma-channel", "fsl,elo-dma-channel";
152+
reg = <0x80 0x80>;
153+
interrupt-parent = <&ipic>;
154+
interrupts = <71 8>;
155+
};
156+
dma-channel@100 {
157+
compatible = "fsl,mpc8315-dma-channel", "fsl,elo-dma-channel";
158+
reg = <0x100 0x80>;
159+
interrupt-parent = <&ipic>;
160+
interrupts = <71 8>;
161+
};
162+
dma-channel@180 {
163+
compatible = "fsl,mpc8315-dma-channel", "fsl,elo-dma-channel";
164+
reg = <0x180 0x28>;
165+
interrupt-parent = <&ipic>;
166+
interrupts = <71 8>;
167+
};
168+
};
169+
135170
usb@23000 {
136171
compatible = "fsl-usb2-dr";
137172
reg = <0x23000 0x1000>;

‎arch/powerpc/boot/dts/mpc832x_mds.dts

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,41 @@
114114
interrupt-parent = <&ipic>;
115115
};
116116

117+
dma@82a8 {
118+
#address-cells = <1>;
119+
#size-cells = <1>;
120+
compatible = "fsl,mpc8323-dma", "fsl,elo-dma";
121+
reg = <0x82a8 4>;
122+
ranges = <0 0x8100 0x1a8>;
123+
interrupt-parent = <&ipic>;
124+
interrupts = <71 8>;
125+
cell-index = <0>;
126+
dma-channel@0 {
127+
compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
128+
reg = <0 0x80>;
129+
interrupt-parent = <&ipic>;
130+
interrupts = <71 8>;
131+
};
132+
dma-channel@80 {
133+
compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
134+
reg = <0x80 0x80>;
135+
interrupt-parent = <&ipic>;
136+
interrupts = <71 8>;
137+
};
138+
dma-channel@100 {
139+
compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
140+
reg = <0x100 0x80>;
141+
interrupt-parent = <&ipic>;
142+
interrupts = <71 8>;
143+
};
144+
dma-channel@180 {
145+
compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
146+
reg = <0x180 0x28>;
147+
interrupt-parent = <&ipic>;
148+
interrupts = <71 8>;
149+
};
150+
};
151+
117152
crypto@30000 {
118153
device_type = "crypto";
119154
model = "SEC2";

‎arch/powerpc/boot/dts/mpc832x_rdb.dts

Lines changed: 53 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
compatible = "fsl-i2c";
6969
reg = <0x3000 0x100>;
7070
interrupts = <14 0x8>;
71-
interrupt-parent = <&pic>;
71+
interrupt-parent = <&ipic>;
7272
dfsrr;
7373
};
7474

@@ -79,7 +79,7 @@
7979
reg = <0x4500 0x100>;
8080
clock-frequency = <0>;
8181
interrupts = <9 0x8>;
82-
interrupt-parent = <&pic>;
82+
interrupt-parent = <&ipic>;
8383
};
8484

8585
serial1: serial@4600 {
@@ -89,7 +89,42 @@
8989
reg = <0x4600 0x100>;
9090
clock-frequency = <0>;
9191
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+
};
93128
};
94129

95130
crypto@30000 {
@@ -98,15 +133,15 @@
98133
compatible = "talitos";
99134
reg = <0x30000 0x7000>;
100135
interrupts = <11 0x8>;
101-
interrupt-parent = <&pic>;
136+
interrupt-parent = <&ipic>;
102137
/* Rev. 2.2 */
103138
num-channels = <1>;
104139
channel-fifo-len = <24>;
105140
exec-units-mask = <0x0000004c>;
106141
descriptor-types-mask = <0x0122003f>;
107142
};
108143

109-
pic:pic@700 {
144+
ipic:pic@700 {
110145
interrupt-controller;
111146
#address-cells = <0>;
112147
#interrupt-cells = <2>;
@@ -240,13 +275,13 @@
240275
compatible = "fsl,ucc-mdio";
241276

242277
phy00:ethernet-phy@00 {
243-
interrupt-parent = <&pic>;
278+
interrupt-parent = <&ipic>;
244279
interrupts = <0>;
245280
reg = <0x0>;
246281
device_type = "ethernet-phy";
247282
};
248283
phy04:ethernet-phy@04 {
249-
interrupt-parent = <&pic>;
284+
interrupt-parent = <&ipic>;
250285
interrupts = <0>;
251286
reg = <0x4>;
252287
device_type = "ethernet-phy";
@@ -261,7 +296,7 @@
261296
reg = <0x80 0x80>;
262297
big-endian;
263298
interrupts = <32 0x8 33 0x8>; //high:32 low:33
264-
interrupt-parent = <&pic>;
299+
interrupt-parent = <&ipic>;
265300
};
266301
};
267302

@@ -270,21 +305,21 @@
270305
interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
271306
interrupt-map = <
272307
/* IDSEL 0x10 AD16 (USB) */
273-
0x8000 0x0 0x0 0x1 &pic 17 0x8
308+
0x8000 0x0 0x0 0x1 &ipic 17 0x8
274309

275310
/* IDSEL 0x11 AD17 (Mini1)*/
276-
0x8800 0x0 0x0 0x1 &pic 18 0x8
277-
0x8800 0x0 0x0 0x2 &pic 19 0x8
278-
0x8800 0x0 0x0 0x3 &pic 20 0x8
279-
0x8800 0x0 0x0 0x4 &pic 48 0x8
311+
0x8800 0x0 0x0 0x1 &ipic 18 0x8
312+
0x8800 0x0 0x0 0x2 &ipic 19 0x8
313+
0x8800 0x0 0x0 0x3 &ipic 20 0x8
314+
0x8800 0x0 0x0 0x4 &ipic 48 0x8
280315

281316
/* IDSEL 0x12 AD18 (PCI/Mini2) */
282-
0x9000 0x0 0x0 0x1 &pic 19 0x8
283-
0x9000 0x0 0x0 0x2 &pic 20 0x8
284-
0x9000 0x0 0x0 0x3 &pic 48 0x8
285-
0x9000 0x0 0x0 0x4 &pic 17 0x8>;
317+
0x9000 0x0 0x0 0x1 &ipic 19 0x8
318+
0x9000 0x0 0x0 0x2 &ipic 20 0x8
319+
0x9000 0x0 0x0 0x3 &ipic 48 0x8
320+
0x9000 0x0 0x0 0x4 &ipic 17 0x8>;
286321

287-
interrupt-parent = <&pic>;
322+
interrupt-parent = <&ipic>;
288323
interrupts = <66 0x8>;
289324
bus-range = <0x0 0x0>;
290325
ranges = <0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000

‎arch/powerpc/boot/dts/mpc8349emitx.dts

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,41 @@
9393
mode = "cpu";
9494
};
9595

96+
dma@82a8 {
97+
#address-cells = <1>;
98+
#size-cells = <1>;
99+
compatible = "fsl,mpc8349-dma", "fsl,elo-dma";
100+
reg = <0x82a8 4>;
101+
ranges = <0 0x8100 0x1a8>;
102+
interrupt-parent = <&ipic>;
103+
interrupts = <71 8>;
104+
cell-index = <0>;
105+
dma-channel@0 {
106+
compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
107+
reg = <0 0x80>;
108+
interrupt-parent = <&ipic>;
109+
interrupts = <71 8>;
110+
};
111+
dma-channel@80 {
112+
compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
113+
reg = <0x80 0x80>;
114+
interrupt-parent = <&ipic>;
115+
interrupts = <71 8>;
116+
};
117+
dma-channel@100 {
118+
compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
119+
reg = <0x100 0x80>;
120+
interrupt-parent = <&ipic>;
121+
interrupts = <71 8>;
122+
};
123+
dma-channel@180 {
124+
compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
125+
reg = <0x180 0x28>;
126+
interrupt-parent = <&ipic>;
127+
interrupts = <71 8>;
128+
};
129+
};
130+
96131
usb@22000 {
97132
compatible = "fsl-usb2-mph";
98133
reg = <0x22000 0x1000>;

0 commit comments

Comments
 (0)