Skip to content

Commit

Permalink
dts: arm: renesas: ra: ra4m1: Adapt to event-based interrupt processing
Browse files Browse the repository at this point in the history 
ICU has been modified to set interrupts by event number,
so we will follow that change.

Signed-off-by: TOKITA Hiroshi <tokita.hiroshi@gmail.com>
  • Loading branch information
@soburi
soburi committed Jul 16, 2024
1 parent a64ec01 commit ba7020f
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 54 deletions.
97 changes: 48 additions & 49 deletions dts/arm/renesas/ra/ra-cm4-common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <mem.h>
#include <freq.h>
#include <arm/armv7-m.dtsi>
#include <zephyr/dt-bindings/interrupt-controller/renesas-ra-icu.h>
#include <zephyr/dt-bindings/interrupt-controller/renesas/ra/ra4m1_events.h>

/ {
cpus {
Expand Down Expand Up @@ -79,7 +79,7 @@
reg = <0x40006000 0x40>;
reg-names = "icu";
interrupt-controller;
#interrupt-cells = <3>;
#interrupt-cells = <2>;
};

cgc: cgc@4001e000 {
Expand Down Expand Up @@ -122,12 +122,12 @@
gpio-controller;
#gpio-cells = <2>;
ngpios = <16>;
interrupts = <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ2>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ3>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ6>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ7>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ10>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ15>;
interrupts = <RA_EVENT_ICU_IRQ2 0>,
<RA_EVENT_ICU_IRQ3 0>,
<RA_EVENT_ICU_IRQ6 0>,
<RA_EVENT_ICU_IRQ7 0>,
<RA_EVENT_ICU_IRQ10 0>,
<RA_EVENT_ICU_IRQ15 0>;
interrupt-names = "port-irq2", "port-irq3", "port-irq6",
"port-irq7", "port-irq10", "port-irq15";
port-irq2-pins = <2>;
Expand All @@ -144,11 +144,11 @@
reg = <0x40040020 0x20>;
gpio-controller;
#gpio-cells = <2>;
interrupts = <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ0>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ1>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ2>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ3>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ4>;
interrupts = <RA_EVENT_ICU_IRQ0 0>,
<RA_EVENT_ICU_IRQ1 0>,
<RA_EVENT_ICU_IRQ2 0>,
<RA_EVENT_ICU_IRQ3 0>,
<RA_EVENT_ICU_IRQ4 0>;
interrupt-names = "port-irq0", "port-irq1", "port-irq2",
"port-irq3", "port-irq4";
port-irq0-pins = <5>;
Expand All @@ -166,13 +166,12 @@
gpio-controller;
#gpio-cells = <2>;
ngpios = <16>;
interrupts = <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ0>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ1>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ2>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ3>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ9>;
interrupts = <RA_EVENT_ICU_IRQ0 0>,
<RA_EVENT_ICU_IRQ1 0>,
<RA_EVENT_ICU_IRQ2 0>,
<RA_EVENT_ICU_IRQ3 0>;
interrupt-names = "port-irq0", "port-irq1", "port-irq2",
"port-irq3", "port-irq9";
"port-irq3";
port-irq0-pins = <6>;
port-irq1-pins = <5>;
port-irq2-pins = <13>;
Expand All @@ -186,10 +185,10 @@
gpio-controller;
#gpio-cells = <2>;
ngpios = <16>;
interrupts = <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ5>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ6>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ8>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ9>;
interrupts = <RA_EVENT_ICU_IRQ5 0>,
<RA_EVENT_ICU_IRQ6 0>,
<RA_EVENT_ICU_IRQ8 0>,
<RA_EVENT_ICU_IRQ9 0>;
interrupt-names = "port-irq5", "port-irq6", "port-irq8", "port-irq9";
port-irq5-pins = <2>;
port-irq6-pins = <1>;
Expand All @@ -204,13 +203,13 @@
gpio-controller;
#gpio-cells = <2>;
ngpios = <16>;
interrupts = <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ0>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ4>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ5>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ6>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ7>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ8>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ9>;
interrupts = <RA_EVENT_ICU_IRQ0 0>,
<RA_EVENT_ICU_IRQ4 0>,
<RA_EVENT_ICU_IRQ5 0>,
<RA_EVENT_ICU_IRQ6 0>,
<RA_EVENT_ICU_IRQ7 0>,
<RA_EVENT_ICU_IRQ8 0>,
<RA_EVENT_ICU_IRQ9 0>;
interrupt-names = "port-irq0", "port-irq4", "port-irq5", "port-irq6",
"port-irq7", "port-irq8", "port-irq9";
port-irq0-pins = <0>;
Expand All @@ -229,9 +228,9 @@
gpio-controller;
#gpio-cells = <2>;
ngpios = <16>;
interrupts = <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ11>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ12>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_PORT_IRQ14>;
interrupts = <RA_EVENT_ICU_IRQ11 0>,
<RA_EVENT_ICU_IRQ12 0>,
<RA_EVENT_ICU_IRQ14 0>;
interrupt-names = "port-irq11", "port-irq12", "port-irq14";
port-irq11-pins = <1>;
port-irq12-pins = <2>;
Expand All @@ -249,12 +248,12 @@
sci0: sci@40070000 {
compatible = "renesas,ra-sci";
reg = <0x40070000 0x20>;
interrupts = <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI0_RXI>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI0_TXI>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI0_TEI>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI0_ERI>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI0_AM>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI0_RXI_OR_ERI>;
interrupts = <RA_EVENT_SCI0_RXI 0>,
<RA_EVENT_SCI0_TXI 0>,
<RA_EVENT_SCI0_TEI 0>,
<RA_EVENT_SCI0_ERI 0>,
<RA_EVENT_SCI0_AM 0>,
<RA_EVENT_SCI0_RXI_OR_ERI 0>;
interrupt-names = "rxi", "txi", "tei", "eri", "am", "rxi-or-eri";
clocks = <&cgc RA_CLOCK_SCI(0)>;
#clock-cells = <1>;
Expand All @@ -268,11 +267,11 @@
sci1: sci@40070020 {
compatible = "renesas,ra-sci";
reg = <0x40070020 0x20>;
interrupts = <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI1_RXI>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI1_TXI>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI1_TEI>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI1_ERI>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI1_AM>;
interrupts = <RA_EVENT_SCI1_RXI 0>,
<RA_EVENT_SCI1_TXI 0>,
<RA_EVENT_SCI1_TEI 0>,
<RA_EVENT_SCI1_ERI 0>,
<RA_EVENT_SCI1_AM 0>;
interrupt-names = "rxi", "txi", "tei", "eri", "am";
clocks = <&cgc RA_CLOCK_SCI(1)>;
#clock-cells = <1>;
Expand All @@ -286,11 +285,11 @@
sci9: sci@40070120 {
compatible = "renesas,ra-sci";
reg = <0x40070120 0x20>;
interrupts = <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI9_RXI>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI9_TXI>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI9_TEI>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI9_ERI>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI9_AM>;
interrupts = <RA_EVENT_SCI9_RXI 0>,
<RA_EVENT_SCI9_TXI 0>,
<RA_EVENT_SCI9_TEI 0>,
<RA_EVENT_SCI9_ERI 0>,
<RA_EVENT_SCI9_AM 0>;
interrupt-names = "rxi", "txi", "tei", "eri", "am";
clocks = <&cgc RA_CLOCK_SCI(9)>;
#clock-cells = <1>;
Expand Down
10 changes: 5 additions & 5 deletions dts/arm/renesas/ra/ra4-cm4-common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@
sci2: sci@40070040 {
compatible = "renesas,ra-sci";
reg = <0x40070040 0x20>;
interrupts = <RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI2_RXI>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI2_TXI>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI2_TEI>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI2_ERI>,
<RA_ICU_IRQ_UNSPECIFIED 0 RA_ICU_SCI2_AM>;
interrupts = <RA_EVENT_SCI2_RXI 0>,
<RA_EVENT_SCI2_TXI 0>,
<RA_EVENT_SCI2_TEI 0>,
<RA_EVENT_SCI2_ERI 0>,
<RA_EVENT_SCI2_AM 0>;
interrupt-names = "rxi", "txi", "tei", "eri", "am";
clocks = <&cgc RA_CLOCK_SCI(2)>;
#clock-cells = <1>;
Expand Down

0 comments on commit ba7020f

Please sign in to comment.