Skip to content

Commit e8a3d51

Browse files
thenguyenyfthenguyenyf
committed
dts: arm: renesas: move RA8x1 interrupts definition from SoC to board
Because of the complexity of the interrupt routing on Renesas RA SoCs, it is better to not define a static information for all board variant of Renesas RA devices at the SoC layer. This commit to move all existing interrupts propeties of Renesas RA8x1 series from SoC to the board dts for enabled node only. Affect to these boards: - ek_ra8m1 - ek_ra8d1 - mck_ra8t1 Signed-off-by: The Nguyen <the.nguyen.yf@renesas.com>
1 parent 2c851d9 commit e8a3d51

File tree

6 files changed

+88
-56
lines changed

6 files changed

+88
-56
lines changed

‎boards/renesas/ek_ra8d1/ek_ra8d1.dts

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@
165165
&sci9 {
166166
pinctrl-0 = <&sci9_default>;
167167
pinctrl-names = "default";
168+
interrupts = <0 12>, <1 12>, <2 12>, <3 12>;
169+
interrupt-names = "rxi", "txi", "tei", "eri";
168170
status = "okay";
169171
uart9: uart {
170172
current-speed = <115200>;
@@ -190,6 +192,14 @@
190192
&spi1 {
191193
pinctrl-0 = <&spi1_default>;
192194
pinctrl-names = "default";
195+
interrupts = <4 12>, <5 12>, <6 12>, <7 12>;
196+
interrupt-names = "rxi", "txi", "tei", "eri";
197+
status = "okay";
198+
};
199+
200+
&flash {
201+
interrupts = <8 12>, <9 12>;
202+
interrupt-names = "frdyi", "fiferr";
193203
status = "okay";
194204
};
195205

@@ -208,17 +218,21 @@
208218

209219
&pwm7 {
210220
pinctrl-0 = <&pwm7_default>;
211-
interrupts = <40 1>, <41 1>;
221+
interrupts = <10 12>, <11 12>;
212222
interrupt-names = "gtioca", "overflow";
213223
pinctrl-names = "default";
214224
status = "okay";
215225
};
216226

217227
&canfd_global {
228+
interrupts = <12 12>, <13 12>;
229+
interrupt-names = "rxf", "glerr";
218230
status = "okay";
219231
canfd0 {
220232
pinctrl-0 = <&canfd0_default>;
221233
pinctrl-names = "default";
234+
interrupts = <14 12>, <15 12>, <16 12>;
235+
interrupt-names = "err", "tx", "rx";
222236
rx-max-filters = <16>;
223237
status = "okay";
224238
};
@@ -230,9 +244,12 @@
230244
clock-frequency = <DT_FREQ_M(1)>;
231245
pinctrl-0 = <&iic1_default>;
232246
pinctrl-names = "default";
247+
interrupts = <17 12>, <18 12>, <19 12>, <20 12>;
248+
interrupt-names = "rxi", "txi", "tei", "eri";
233249
};
234250

235251
&eth {
252+
interrupts = <21 0>;
236253
local-mac-address = [74 90 50 B0 5D E9];
237254
status = "okay";
238255
phy-handle = <&phy>;
@@ -253,6 +270,8 @@
253270
&usbhs {
254271
pinctrl-0 = <&usbhs_default>;
255272
pinctrl-names = "default";
273+
interrupts = <22 12>;
274+
interrupt-names = "usbhs-ir";
256275
maximum-speed = "high-speed";
257276
status = "okay";
258277
zephyr_udc0: udc {
@@ -268,6 +287,8 @@
268287
status = "okay";
269288
pinctrl-0 = <&adc0_default>;
270289
pinctrl-names = "default";
290+
interrupts = <23 12>;
291+
interrupt-names = "scanend";
271292
};
272293

273294
&dac0 {
@@ -277,12 +298,12 @@
277298
};
278299

279300
&port_irq12 {
280-
interrupts = <88 12>;
301+
interrupts = <24 12>;
281302
status = "okay";
282303
};
283304

284305
&port_irq13 {
285-
interrupts = <89 12>;
306+
interrupts = <25 12>;
286307
status = "okay";
287308
};
288309

@@ -328,6 +349,8 @@ pmod_sd_shield: &sdhc1 {};
328349
};
329350

330351
&ulpt0 {
352+
interrupt-names = "ulpti";
353+
interrupts = <26 1>;
331354
status = "okay";
332355

333356
timer {

‎boards/renesas/ek_ra8m1/ek_ra8m1.dts

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,8 @@
213213
&sci0 {
214214
pinctrl-0 = <&sci0_default>;
215215
pinctrl-names = "default";
216+
interrupts = <0 12>, <1 12>, <2 12>, <3 12>;
217+
interrupt-names = "rxi", "txi", "tei", "eri";
216218
status = "okay";
217219
uart0: uart {
218220
current-speed = <115200>;
@@ -234,6 +236,8 @@
234236
&sci2 {
235237
pinctrl-0 = <&sci2_default>;
236238
pinctrl-names = "default";
239+
interrupts = <4 12>, <5 12>, <6 12>, <7 12>;
240+
interrupt-names = "rxi", "txi", "tei", "eri";
237241
status = "okay";
238242
uart2: uart {
239243
current-speed = <115200>;
@@ -244,6 +248,8 @@
244248
&sci3 {
245249
pinctrl-0 = <&sci3_default>;
246250
pinctrl-names = "default";
251+
interrupts = <8 12>, <9 12>, <10 12>, <11 12>;
252+
interrupt-names = "rxi", "txi", "tei", "eri";
247253
status = "okay";
248254
uart3: uart {
249255
current-speed = <115200>;
@@ -254,6 +260,8 @@
254260
&sci9 {
255261
pinctrl-0 = <&sci9_default>;
256262
pinctrl-names = "default";
263+
interrupts = <12 12>, <13 12>, <14 12>, <15 12>;
264+
interrupt-names = "rxi", "txi", "tei", "eri";
257265
status = "okay";
258266
uart9: uart {
259267
current-speed = <115200>;
@@ -269,12 +277,16 @@ mikrobus_serial: &uart3 {};
269277
clock-frequency = <DT_FREQ_M(1)>;
270278
pinctrl-0 = <&iic1_default>;
271279
pinctrl-names = "default";
280+
interrupts = <16 12>, <17 12>, <18 1>, <19 12>;
281+
interrupt-names = "rxi", "txi", "tei", "eri";
272282
};
273283

274284
&adc0 {
275285
status = "okay";
276286
pinctrl-0 = <&adc0_default>;
277287
pinctrl-names = "default";
288+
interrupts = <20 12>;
289+
interrupt-names = "scanend";
278290
average-count = <4>;
279291
};
280292

@@ -291,17 +303,25 @@ mikrobus_serial: &uart3 {};
291303
&spi1 {
292304
pinctrl-0 = <&spi1_default>;
293305
pinctrl-names = "default";
306+
interrupts = <21 12>, <22 12>, <23 12>, <24 12>;
307+
interrupt-names = "rxi", "txi", "tei", "eri";
294308
status = "okay";
295309
};
296310

297311
&pwm7 {
298312
pinctrl-0 = <&pwm7_default>;
299-
interrupts = <40 1>, <41 1>;
313+
interrupts = <25 12>, <26 12>;
300314
interrupt-names = "gtioca", "overflow";
301315
pinctrl-names = "default";
302316
status = "okay";
303317
};
304318

319+
&flash {
320+
interrupts = <27 1>, <28 1>;
321+
interrupt-names = "frdyi", "fiferr";
322+
status = "okay";
323+
};
324+
305325
&flash1 {
306326
partitions {
307327
compatible = "fixed-partitions";
@@ -316,10 +336,14 @@ mikrobus_serial: &uart3 {};
316336
};
317337

318338
&canfd_global {
339+
interrupts = <29 1>, <30 1>;
340+
interrupt-names = "rxf", "glerr";
319341
status = "okay";
320342
canfd0 {
321343
pinctrl-0 = <&canfd0_default>;
322344
pinctrl-names = "default";
345+
interrupts = <31 12>, <32 12>, <33 12>;
346+
interrupt-names = "err", "tx", "rx";
323347
phys = <&transceiver0>;
324348
rx-max-filters = <16>;
325349
status = "okay";
@@ -333,6 +357,7 @@ pmod_serial: &pmod1_serial {};
333357
pmod_header: &pmod1_header {};
334358

335359
&eth {
360+
interrupts = <34 0>;
336361
local-mac-address = [74 90 50 B0 6D 5A];
337362
status = "okay";
338363
phy-handle = <&phy>;
@@ -353,6 +378,8 @@ pmod_header: &pmod1_header {};
353378
&usbhs {
354379
pinctrl-0 = <&usbhs_default>;
355380
pinctrl-names = "default";
381+
interrupts = <35 12>;
382+
interrupt-names = "usbhs-ir";
356383
maximum-speed = "high-speed";
357384
status = "okay";
358385
zephyr_udc0: udc {
@@ -365,12 +392,12 @@ pmod_header: &pmod1_header {};
365392
};
366393

367394
&port_irq12 {
368-
interrupts = <88 12>;
395+
interrupts = <36 12>;
369396
status = "okay";
370397
};
371398

372399
&port_irq13 {
373-
interrupts = <89 12>;
400+
interrupts = <37 12>;
374401
status = "okay";
375402
};
376403

@@ -387,6 +414,8 @@ pmod_sd_shield: &sdhc0 {};
387414
};
388415

389416
&ulpt0 {
417+
interrupt-names = "ulpti";
418+
interrupts = <38 1>;
390419
status = "okay";
391420

392421
timer {

‎boards/renesas/mck_ra8t1/mck_ra8t1.dts

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@
112112
&sci3 {
113113
pinctrl-0 = <&sci3_default>;
114114
pinctrl-names = "default";
115+
interrupts = <0 12>, <1 12>, <2 12>, <3 12>;
116+
interrupt-names = "rxi", "txi", "tei", "eri";
115117
status = "okay";
116118
uart3: uart {
117119
current-speed = <115200>;
@@ -137,6 +139,14 @@
137139
&spi0 {
138140
pinctrl-0 = <&spi0_default>;
139141
pinctrl-names = "default";
142+
interrupts = <4 12>, <5 12>, <6 12>, <7 12>;
143+
interrupt-names = "rxi", "txi", "tei", "eri";
144+
status = "okay";
145+
};
146+
147+
&flash {
148+
interrupts = <8 1>, <9 1>;
149+
interrupt-names = "frdyi", "fiferr";
140150
status = "okay";
141151
};
142152

@@ -155,17 +165,21 @@
155165

156166
&pwm2 {
157167
pinctrl-0 = <&pwm2_default>;
158-
interrupts = <40 1>, <41 1>;
168+
interrupts = <10 12>, <11 12>;
159169
interrupt-names = "gtioca", "overflow";
160170
pinctrl-names = "default";
161171
status = "okay";
162172
};
163173

164174
&canfd_global {
175+
interrupts = <12 12>, <13 12>;
176+
interrupt-names = "rxf", "glerr";
165177
status = "okay";
166178
canfd1 {
167179
pinctrl-0 = <&canfd1_default>;
168180
pinctrl-names = "default";
181+
interrupts = <14 12>, <15 12>, <16 12>;
182+
interrupt-names = "err", "tx", "rx";
169183
rx-max-filters = <16>;
170184
status = "okay";
171185
};
@@ -177,9 +191,12 @@
177191
clock-frequency = <DT_FREQ_M(1)>;
178192
pinctrl-0 = <&iic1_default>;
179193
pinctrl-names = "default";
194+
interrupts = <17 12>, <18 12>, <19 12>, <20 12>;
195+
interrupt-names = "rxi", "txi", "tei", "eri";
180196
};
181197

182198
&eth {
199+
interrupts = <21 0>;
183200
local-mac-address = [74 90 50 6D 81 75];
184201
status = "okay";
185202
phy-handle = <&phy>;
@@ -201,6 +218,8 @@
201218
status = "okay";
202219
pinctrl-0 = <&adc0_default>;
203220
pinctrl-names = "default";
221+
interrupts = <22 12>;
222+
interrupt-names = "scanend";
204223
average-count = <4>;
205224
};
206225

@@ -213,6 +232,8 @@
213232
&sdhc0 {
214233
compatible = "renesas,ra-sdhc";
215234
pinctrl-0 = <&sdhc0_default>;
235+
interrupt-names = "accs", "card", "dma-req";
236+
interrupts = <23 12>, <24 12>, <25 12>;
216237
enable-gpios = <&ioport3 11 GPIO_ACTIVE_HIGH>;
217238
pinctrl-names = "default";
218239
status = "okay";
@@ -226,6 +247,8 @@
226247
&usbfs {
227248
pinctrl-0 = <&usbfs_default>;
228249
pinctrl-names = "default";
250+
interrupts = <26 12>, <27 12>;
251+
interrupt-names = "usbfs-i", "usbfs-r";
229252
maximum-speed = "full-speed";
230253
status = "okay";
231254
zephyr_udc0: udc {
@@ -238,6 +261,8 @@
238261
};
239262

240263
&ulpt0 {
264+
interrupt-names = "ulpti";
265+
interrupts = <28 1>;
241266
status = "okay";
242267

243268
timer {

‎dts/arm/renesas/ra/ra8/r7fa8d1xh.dtsi

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
compatible = "renesas,ra-glcdc";
2222
reg = <0x40342000 0x1454>;
2323
clocks = <&lcdclk MSTPC 4>;
24-
interrupts = <71 1>;
25-
interrupt-names = "line";
2624
status = "disabled";
2725
};
2826

@@ -31,8 +29,6 @@
3129
#address-cells = <1>;
3230
#size-cells = <0>;
3331
reg = <0x40346000 0x2000>;
34-
interrupts = <72 12>, <73 12>, <74 12>, <75 12>, <76 12>, <77 12>;
35-
interrupt-names = "sq0", "sq1", "vm", "rcv", "ferr", "ppi";
3632
clocks = <&lcdclk MSTPC 10>;
3733
status = "disabled";
3834
};
@@ -283,8 +279,6 @@
283279
usbhs: usbhs@40351000 {
284280
compatible = "renesas,ra-usbhs";
285281
reg = <0x40351000 0x2000>;
286-
interrupts = <54 12>;
287-
interrupt-names = "usbhs-ir";
288282
num-bidir-endpoints = <10>;
289283
phys = <&usbhs_phy>;
290284
phys-clock = <&uclk>, <&u60clk>;

‎dts/arm/renesas/ra/ra8/r7fa8m1xh.dtsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,6 @@
247247
usbhs: usbhs@40351000 {
248248
compatible = "renesas,ra-usbhs";
249249
reg = <0x40351000 0x2000>;
250-
interrupts = <54 12>;
251-
interrupt-names = "usbhs-ir";
252250
num-bidir-endpoints = <10>;
253251
phys = <&usbhs_phy>;
254252
phys-clock = <&uclk>, <&u60clk>;

0 commit comments

Comments
 (0)