Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dts: renesas: ra: Handle interrupt numbers generation for Renesas RA series #78952

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions dts/arm/renesas/ra/ra2/ra2xx.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra.h>
#include <zephyr/dt-bindings/clock/ra_clock.h>
#include <freq.h>
#include <zephyr/dt-bindings/interrupt-controller/renesas-ra-interrupt.h>

/ {
cpus {
Expand All @@ -23,6 +24,15 @@
};

soc {
interrupt-parent = <&icu>;
icu: interrupt-controller@40006000 {
compatible = "renesas,ra-interrupt-controller";
reg = <0x40006000 0x40>;
reg-names = "icu";
interrupt-controller;
#interrupt-cells = <2>;
};

system: system@4001e000 {
compatible = "renesas,ra-system";
reg = <0x4001e000 0x1000>;
Expand Down Expand Up @@ -137,7 +147,8 @@

sci0: sci@40070000 {
compatible = "renesas,ra-sci";
interrupts = <4 1>, <5 1>, <6 1>, <7 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40070000 0x20>;
clocks = <&pclkb MSTPB 31>;
Expand All @@ -151,7 +162,8 @@

sci1: sci@40070020 {
compatible = "renesas,ra-sci";
interrupts = <8 1>, <9 1>, <10 1>, <11 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40070020 0x20>;
clocks = <&pclkb MSTPB 30>;
Expand All @@ -165,7 +177,8 @@

sci2: sci@40070040 {
compatible = "renesas,ra-sci";
interrupts = <12 1>, <13 1>, <14 1>, <15 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40070040 0x20>;
clocks = <&pclkb MSTPB 29>;
Expand All @@ -179,7 +192,8 @@

sci3: sci@40070060 {
compatible = "renesas,ra-sci";
interrupts = <16 1>, <17 1>, <18 1>, <19 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40070060 0x20>;
clocks = <&pclkb MSTPB 28>;
Expand All @@ -193,7 +207,8 @@

sci9: sci@40070120 {
compatible = "renesas,ra-sci";
interrupts = <24 1>, <25 1>, <26 1>, <27 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40070120 0x20>;
clocks = <&pclkb MSTPB 22>;
Expand Down
12 changes: 8 additions & 4 deletions dts/arm/renesas/ra/ra4/r7fa4m2ax.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@

sci1: sci1@40118100 {
compatible = "renesas,ra-sci";
interrupts = <4 1>, <5 1>, <6 1>, <7 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40118100 0x100>;
clocks = <&pclka MSTPB 30>;
Expand All @@ -50,7 +51,8 @@

sci2: sci2@40118200 {
compatible = "renesas,ra-sci";
interrupts = <8 1>, <9 1>, <10 1>, <11 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40118200 0x100>;
clocks = <&pclka MSTPB 29>;
Expand All @@ -64,7 +66,8 @@

sci3: sci3@40118300 {
compatible = "renesas,ra-sci";
interrupts = <12 1>, <13 1>, <14 1>, <15 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40118300 0x100>;
clocks = <&pclka MSTPB 28>;
Expand All @@ -78,7 +81,8 @@

sci4: sci4@40118400 {
compatible = "renesas,ra-sci";
interrupts = <16 1>, <17 1>, <18 1>, <19 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40118400 0x100>;
clocks = <&pclka MSTPB 27>;
Expand Down
12 changes: 8 additions & 4 deletions dts/arm/renesas/ra/ra4/r7fa4m3ax.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@

sci1: sci1@40118100 {
compatible = "renesas,ra-sci";
interrupts = <4 1>, <5 1>, <6 1>, <7 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40118100 0x100>;
clocks = <&pclka MSTPB 30>;
Expand All @@ -60,7 +61,8 @@

sci2: sci2@40118200 {
compatible = "renesas,ra-sci";
interrupts = <8 1>, <9 1>, <10 1>, <11 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40118200 0x100>;
clocks = <&pclka MSTPB 29>;
Expand All @@ -74,7 +76,8 @@

sci3: sci3@40118300 {
compatible = "renesas,ra-sci";
interrupts = <12 1>, <13 1>, <14 1>, <15 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40118300 0x100>;
clocks = <&pclka MSTPB 28>;
Expand All @@ -88,7 +91,8 @@

sci4: sci4@40118400 {
compatible = "renesas,ra-sci";
interrupts = <16 1>, <17 1>, <18 1>, <19 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40118400 0x100>;
clocks = <&pclka MSTPB 27>;
Expand Down
3 changes: 2 additions & 1 deletion dts/arm/renesas/ra/ra4/r7fa4w1ad2cng.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@

sci4: sci4@40070080 {
compatible = "renesas,ra-sci";
interrupts = <16 1>, <17 1>, <18 1>, <19 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40070080 0x20>;
clocks = <&pclka MSTPB 26>;
Expand Down
16 changes: 13 additions & 3 deletions dts/arm/renesas/ra/ra4/ra4-cm33-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <arm/armv8-m.dtsi>
#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra.h>
#include <freq.h>
#include <zephyr/dt-bindings/interrupt-controller/renesas-ra-interrupt.h>

/ {
cpus {
Expand All @@ -29,7 +30,14 @@
};

soc {
interrupt-parent = <&nvic>;
interrupt-parent = <&icu>;
icu: interrupt-controller@40006000 {
compatible = "renesas,ra-interrupt-controller";
reg = <0x40006000 0x40>;
reg-names = "icu";
interrupt-controller;
#interrupt-cells = <2>;
};

system: system@4001e000 {
compatible = "renesas,ra-system";
Expand Down Expand Up @@ -111,7 +119,8 @@

sci0: sci0@40118000 {
compatible = "renesas,ra-sci";
interrupts = <0 1>, <1 1>, <2 1>, <3 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40118000 0x100>;
clocks = <&pclka MSTPB 31>;
Expand All @@ -125,7 +134,8 @@

sci9: sci9@40118900 {
compatible = "renesas,ra-sci";
interrupts = <36 1>, <37 1>, <38 1>, <39 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40118900 0x100>;
clocks = <&pclka MSTPB 22>;
Expand Down
19 changes: 16 additions & 3 deletions dts/arm/renesas/ra/ra4/ra4-cm4-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <arm/armv7-m.dtsi>
#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra.h>
#include <freq.h>
#include <zephyr/dt-bindings/interrupt-controller/renesas-ra-interrupt.h>

/ {
cpus {
Expand All @@ -30,6 +31,15 @@
};

soc {
interrupt-parent = <&icu>;
icu: interrupt-controller@40006000 {
compatible = "renesas,ra-interrupt-controller";
reg = <0x40006000 0x40>;
reg-names = "icu";
interrupt-controller;
#interrupt-cells = <2>;
};

system: system@4001e000 {
compatible = "renesas,ra-system";
reg = <0x4001e000 0x1000>;
Expand Down Expand Up @@ -120,7 +130,8 @@

sci0: sci0@40070000 {
compatible = "renesas,ra-sci";
interrupts = <0 1>, <1 1>, <2 1>, <3 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40070000 0x20>;
clocks = <&pclka MSTPB 31>;
Expand All @@ -134,7 +145,8 @@

sci1: sci1@40070020 {
compatible = "renesas,ra-sci";
interrupts = <4 1>, <5 1>, <6 1>, <7 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40070020 0x20>;
clocks = <&pclka MSTPB 30>;
Expand All @@ -148,7 +160,8 @@

sci9: sci9@40070120 {
compatible = "renesas,ra-sci";
interrupts = <36 1>, <37 1>, <38 1>, <39 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40070120 0x20>;
clocks = <&pclka MSTPB 22>;
Expand Down
12 changes: 8 additions & 4 deletions dts/arm/renesas/ra/ra6/r7fa6e10x.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@

sci1: sci1@40118100 {
compatible = "renesas,ra-sci";
interrupts = <4 1>, <5 1>, <6 1>, <7 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40118100 0x100>;
clocks = <&pclka MSTPB 30>;
Expand All @@ -50,7 +51,8 @@

sci2: sci2@40118200 {
compatible = "renesas,ra-sci";
interrupts = <8 1>, <9 1>, <10 1>, <11 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40118200 0x100>;
clocks = <&pclka MSTPB 29>;
Expand All @@ -64,7 +66,8 @@

sci3: sci3@40118300 {
compatible = "renesas,ra-sci";
interrupts = <12 1>, <13 1>, <14 1>, <15 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40118300 0x100>;
clocks = <&pclka MSTPB 28>;
Expand All @@ -78,7 +81,8 @@

sci4: sci4@40118400 {
compatible = "renesas,ra-sci";
interrupts = <16 1>, <17 1>, <18 1>, <19 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x40118400 0x100>;
clocks = <&pclka MSTPB 27>;
Expand Down
2 changes: 1 addition & 1 deletion dts/arm/renesas/ra/ra6/r7fa6m2af3cfb.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
reg = <0x407e0000 0x10000>;
#address-cells = <1>;
#size-cells = <1>;
interrupts = <4 1>, <5 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "frdyi", "fiferr";

flash0: flash@0 {
Expand Down
9 changes: 6 additions & 3 deletions dts/arm/renesas/ra/ra6/r7fa6m2ax.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@

sci5: sci5@400700a0 {
compatible = "renesas,ra-sci";
interrupts = <20 1>, <21 1>, <22 1>, <23 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x400700a0 0x20>;
clocks = <&pclka MSTPB 26>;
Expand All @@ -30,7 +31,8 @@

sci6: sci6@400700c0 {
compatible = "renesas,ra-sci";
interrupts = <24 1>, <25 1>, <26 1>, <27 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x400700c0 0x20>;
clocks = <&pclka MSTPB 25>;
Expand All @@ -44,7 +46,8 @@

sci7: sci7@400700e0 {
compatible = "renesas,ra-sci";
interrupts = <28 1>, <29 1>, <30 1>, <31 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x400700e0 0x20>;
clocks = <&pclka MSTPB 24>;
Expand Down
9 changes: 6 additions & 3 deletions dts/arm/renesas/ra/ra6/r7fa6m3ax.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@

sci5: sci5@400700a0 {
compatible = "renesas,ra-sci";
interrupts = <20 1>, <21 1>, <22 1>, <23 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x400700a0 0x20>;
clocks = <&pclka MSTPB 26>;
Expand All @@ -70,7 +71,8 @@

sci6: sci6@400700c0 {
compatible = "renesas,ra-sci";
interrupts = <24 1>, <25 1>, <26 1>, <27 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x400700c0 0x20>;
clocks = <&pclka MSTPB 25>;
Expand All @@ -84,7 +86,8 @@

sci7: sci7@400700e0 {
compatible = "renesas,ra-sci";
interrupts = <28 1>, <29 1>, <30 1>, <31 1>;
interrupts = <RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>,
<RA_ICU_UNSPECIFIED 1>, <RA_ICU_UNSPECIFIED 1>;
interrupt-names = "rxi", "txi", "tei", "eri";
reg = <0x400700e0 0x20>;
clocks = <&pclka MSTPB 24>;
Expand Down
Loading
Loading