Skip to content

Commit bfb7828

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 d2a5c1c commit bfb7828

File tree

6 files changed

+85
-56
lines changed

6 files changed

+85
-56
lines changed

‎boards/renesas/ek_ra8d1/ek_ra8d1.dts

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,8 @@
185185
&sci9 {
186186
pinctrl-0 = <&sci9_default>;
187187
pinctrl-names = "default";
188+
interrupts = <0 12>, <1 12>, <2 12>, <3 12>;
189+
interrupt-names = "rxi", "txi", "tei", "eri";
188190
status = "okay";
189191
uart9: uart {
190192
current-speed = <115200>;
@@ -210,6 +212,14 @@
210212
&spi1 {
211213
pinctrl-0 = <&spi1_default>;
212214
pinctrl-names = "default";
215+
interrupts = <4 12>, <5 12>, <6 12>, <7 12>;
216+
interrupt-names = "rxi", "txi", "tei", "eri";
217+
status = "okay";
218+
};
219+
220+
&flash {
221+
interrupts = <8 12>, <9 12>;
222+
interrupt-names = "frdyi", "fiferr";
213223
status = "okay";
214224
};
215225

@@ -228,17 +238,21 @@
228238

229239
&pwm7 {
230240
pinctrl-0 = <&pwm7_default>;
231-
interrupts = <40 1>, <41 1>;
241+
interrupts = <10 12>, <11 12>;
232242
interrupt-names = "gtioca", "overflow";
233243
pinctrl-names = "default";
234244
status = "okay";
235245
};
236246

237247
&canfd_global {
248+
interrupts = <12 12>, <13 12>;
249+
interrupt-names = "rxf", "glerr";
238250
status = "okay";
239251
canfd0 {
240252
pinctrl-0 = <&canfd0_default>;
241253
pinctrl-names = "default";
254+
interrupts = <14 12>, <15 12>, <16 12>;
255+
interrupt-names = "err", "tx", "rx";
242256
rx-max-filters = <16>;
243257
status = "okay";
244258
};
@@ -250,9 +264,12 @@
250264
clock-frequency = <DT_FREQ_M(1)>;
251265
pinctrl-0 = <&iic1_default>;
252266
pinctrl-names = "default";
267+
interrupts = <17 12>, <18 12>, <19 12>, <20 12>;
268+
interrupt-names = "rxi", "txi", "tei", "eri";
253269
};
254270

255271
&eth {
272+
interrupts = <21 0>;
256273
local-mac-address = [74 90 50 B0 5D E9];
257274
status = "okay";
258275
phy-handle = <&phy>;
@@ -273,6 +290,8 @@
273290
&usbhs {
274291
pinctrl-0 = <&usbhs_default>;
275292
pinctrl-names = "default";
293+
interrupts = <22 12>;
294+
interrupt-names = "usbhs-ir";
276295
maximum-speed = "high-speed";
277296
status = "okay";
278297
zephyr_udc0: udc {
@@ -288,6 +307,8 @@
288307
status = "okay";
289308
pinctrl-0 = <&adc0_default>;
290309
pinctrl-names = "default";
310+
interrupts = <23 12>;
311+
interrupt-names = "scanend";
291312
};
292313

293314
&dac0 {
@@ -297,12 +318,12 @@
297318
};
298319

299320
&port_irq12 {
300-
interrupts = <88 12>;
321+
interrupts = <24 12>;
301322
status = "okay";
302323
};
303324

304325
&port_irq13 {
305-
interrupts = <89 12>;
326+
interrupts = <25 12>;
306327
status = "okay";
307328
};
308329

@@ -348,6 +369,8 @@ pmod_sd_shield: &sdhc1 {};
348369
};
349370

350371
&ulpt0 {
372+
interrupt-names = "ulpti";
373+
interrupts = <26 1>;
351374
status = "okay";
352375

353376
timer {

‎boards/renesas/ek_ra8m1/ek_ra8m1.dts

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,8 @@
232232
&sci0 {
233233
pinctrl-0 = <&sci0_default>;
234234
pinctrl-names = "default";
235+
interrupts = <0 12>, <1 12>, <2 12>, <3 12>;
236+
interrupt-names = "rxi", "txi", "tei", "eri";
235237
status = "okay";
236238
uart0: uart {
237239
current-speed = <115200>;
@@ -253,6 +255,8 @@
253255
&sci2 {
254256
pinctrl-0 = <&sci2_default>;
255257
pinctrl-names = "default";
258+
interrupts = <4 12>, <5 12>, <6 12>, <7 12>;
259+
interrupt-names = "rxi", "txi", "tei", "eri";
256260
status = "okay";
257261
uart2: uart {
258262
current-speed = <115200>;
@@ -263,6 +267,8 @@
263267
&sci3 {
264268
pinctrl-0 = <&sci3_default>;
265269
pinctrl-names = "default";
270+
interrupts = <8 12>, <9 12>, <10 12>, <11 12>;
271+
interrupt-names = "rxi", "txi", "tei", "eri";
266272
status = "okay";
267273
uart3: uart {
268274
current-speed = <115200>;
@@ -273,6 +279,8 @@
273279
&sci9 {
274280
pinctrl-0 = <&sci9_default>;
275281
pinctrl-names = "default";
282+
interrupts = <12 12>, <13 12>, <14 12>, <15 12>;
283+
interrupt-names = "rxi", "txi", "tei", "eri";
276284
status = "okay";
277285
uart9: uart {
278286
current-speed = <115200>;
@@ -288,12 +296,16 @@ mikrobus_serial: &uart3 {};
288296
clock-frequency = <DT_FREQ_M(1)>;
289297
pinctrl-0 = <&iic1_default>;
290298
pinctrl-names = "default";
299+
interrupts = <16 12>, <17 12>, <18 1>, <19 12>;
300+
interrupt-names = "rxi", "txi", "tei", "eri";
291301
};
292302

293303
&adc0 {
294304
status = "okay";
295305
pinctrl-0 = <&adc0_default>;
296306
pinctrl-names = "default";
307+
interrupts = <20 12>;
308+
interrupt-names = "scanend";
297309
average-count = <4>;
298310
};
299311

@@ -310,17 +322,25 @@ mikrobus_serial: &uart3 {};
310322
&spi1 {
311323
pinctrl-0 = <&spi1_default>;
312324
pinctrl-names = "default";
325+
interrupts = <21 12>, <22 12>, <23 12>, <24 12>;
326+
interrupt-names = "rxi", "txi", "tei", "eri";
313327
status = "okay";
314328
};
315329

316330
&pwm7 {
317331
pinctrl-0 = <&pwm7_default>;
318-
interrupts = <40 1>, <41 1>;
332+
interrupts = <25 12>, <26 12>;
319333
interrupt-names = "gtioca", "overflow";
320334
pinctrl-names = "default";
321335
status = "okay";
322336
};
323337

338+
&flash {
339+
interrupts = <27 1>, <28 1>;
340+
interrupt-names = "frdyi", "fiferr";
341+
status = "okay";
342+
};
343+
324344
&flash1 {
325345
partitions {
326346
compatible = "fixed-partitions";
@@ -335,10 +355,14 @@ mikrobus_serial: &uart3 {};
335355
};
336356

337357
&canfd_global {
358+
interrupts = <29 1>, <30 1>;
359+
interrupt-names = "rxf", "glerr";
338360
status = "okay";
339361
canfd0 {
340362
pinctrl-0 = <&canfd0_default>;
341363
pinctrl-names = "default";
364+
interrupts = <31 12>, <32 12>, <33 12>;
365+
interrupt-names = "err", "tx", "rx";
342366
phys = <&transceiver0>;
343367
rx-max-filters = <16>;
344368
status = "okay";
@@ -352,6 +376,7 @@ pmod_serial: &pmod1_serial {};
352376
pmod_header: &pmod1_header {};
353377

354378
&eth {
379+
interrupts = <34 0>;
355380
local-mac-address = [74 90 50 B0 6D 5A];
356381
status = "okay";
357382
phy-handle = <&phy>;
@@ -372,6 +397,8 @@ pmod_header: &pmod1_header {};
372397
&usbhs {
373398
pinctrl-0 = <&usbhs_default>;
374399
pinctrl-names = "default";
400+
interrupts = <35 12>;
401+
interrupt-names = "usbhs-ir";
375402
maximum-speed = "high-speed";
376403
status = "okay";
377404
zephyr_udc0: udc {
@@ -384,12 +411,12 @@ pmod_header: &pmod1_header {};
384411
};
385412

386413
&port_irq12 {
387-
interrupts = <88 12>;
414+
interrupts = <36 12>;
388415
status = "okay";
389416
};
390417

391418
&port_irq13 {
392-
interrupts = <89 12>;
419+
interrupts = <37 12>;
393420
status = "okay";
394421
};
395422

@@ -406,6 +433,8 @@ pmod_sd_shield: &sdhc0 {};
406433
};
407434

408435
&ulpt0 {
436+
interrupt-names = "ulpti";
437+
interrupts = <38 1>;
409438
status = "okay";
410439

411440
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)