Skip to content

Commit bf5fd24

Browse files
zampierilucaszampierilucas
committed
Merge: Backport the Renesas R-Car S4 device tree
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/5008 JIRA: https://issues.redhat.com/browse/RHEL-53987 Backport the Renesas R-Car S4 device tree Signed-off-by: Steve Dunnagan <sdunnaga@redhat.com> Approved-by: Radu Rendec <rrendec@redhat.com> Approved-by: Mark Langsdorf <mlangsdo@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Lucas Zampieri <lzampier@redhat.com>
2 parents 3ec35f3 + c3d941b commit bf5fd24

34 files changed

+2158
-51
lines changed

‎arch/arm/boot/dts/r8a7740.dtsi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,7 @@
404404
interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
405405
<GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>,
406406
<GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>;
407+
interrupt-names = "tuni0", "tuni1", "tuni2";
407408
clocks = <&mstp1_clks R8A7740_CLK_TMU0>;
408409
clock-names = "fck";
409410
power-domains = <&pd_a4r>;
@@ -419,6 +420,7 @@
419420
interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>,
420421
<GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>,
421422
<GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>;
423+
interrupt-names = "tuni0", "tuni1", "tuni2";
422424
clocks = <&mstp1_clks R8A7740_CLK_TMU1>;
423425
clock-names = "fck";
424426
power-domains = <&pd_a4r>;

‎arch/arm/boot/dts/r8a7743.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
compatible = "renesas,r8a7743-wdt",
141141
"renesas,rcar-gen2-wdt";
142142
reg = <0 0xe6020000 0 0x0c>;
143+
interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
143144
clocks = <&cpg CPG_MOD 402>;
144145
power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
145146
resets = <&cpg 402>;

‎arch/arm/boot/dts/r8a7744.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
compatible = "renesas,r8a7744-wdt",
141141
"renesas,rcar-gen2-wdt";
142142
reg = <0 0xe6020000 0 0x0c>;
143+
interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
143144
clocks = <&cpg CPG_MOD 402>;
144145
power-domains = <&sysc R8A7744_PD_ALWAYS_ON>;
145146
resets = <&cpg 402>;

‎arch/arm/boot/dts/r8a7745.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@
270270
rwdt: watchdog@e6020000 {
271271
compatible = "renesas,r8a7745-wdt",
272272
"renesas,rcar-gen2-wdt";
273+
interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
273274
reg = <0 0xe6020000 0 0x0c>;
274275
clocks = <&cpg CPG_MOD 402>;
275276
power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;

‎arch/arm/boot/dts/r8a77470.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
compatible = "renesas,r8a77470-wdt",
9292
"renesas,rcar-gen2-wdt";
9393
reg = <0 0xe6020000 0 0x0c>;
94+
interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
9495
clocks = <&cpg CPG_MOD 402>;
9596
power-domains = <&sysc R8A77470_PD_ALWAYS_ON>;
9697
resets = <&cpg 402>;

‎arch/arm/boot/dts/r8a7778.dtsi‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,9 @@
199199
reg = <0xffd80000 0x30>;
200200
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>,
201201
<GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>,
202-
<GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
202+
<GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>,
203+
<GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
204+
interrupt-names = "tuni0", "tuni1", "tuni2", "ticpi2";
203205
clocks = <&mstp0_clks R8A7778_CLK_TMU0>;
204206
clock-names = "fck";
205207
power-domains = <&cpg_clocks>;
@@ -214,7 +216,9 @@
214216
reg = <0xffd81000 0x30>;
215217
interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>,
216218
<GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,
217-
<GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
219+
<GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,
220+
<GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
221+
interrupt-names = "tuni0", "tuni1", "tuni2", "ticpi2";
218222
clocks = <&mstp0_clks R8A7778_CLK_TMU1>;
219223
clock-names = "fck";
220224
power-domains = <&cpg_clocks>;
@@ -230,6 +234,7 @@
230234
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
231235
<GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,
232236
<GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
237+
interrupt-names = "tuni0", "tuni1", "tuni2";
233238
clocks = <&mstp0_clks R8A7778_CLK_TMU2>;
234239
clock-names = "fck";
235240
power-domains = <&cpg_clocks>;

‎arch/arm/boot/dts/r8a7779.dtsi‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,9 @@
339339
reg = <0xffd80000 0x30>;
340340
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>,
341341
<GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>,
342-
<GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
342+
<GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>,
343+
<GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
344+
interrupt-names = "tuni0", "tuni1", "tuni2", "ticpi2";
343345
clocks = <&mstp0_clks R8A7779_CLK_TMU0>;
344346
clock-names = "fck";
345347
power-domains = <&sysc R8A7779_PD_ALWAYS_ON>;
@@ -354,7 +356,9 @@
354356
reg = <0xffd81000 0x30>;
355357
interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>,
356358
<GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,
357-
<GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
359+
<GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,
360+
<GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
361+
interrupt-names = "tuni0", "tuni1", "tuni2", "ticpi2";
358362
clocks = <&mstp0_clks R8A7779_CLK_TMU1>;
359363
clock-names = "fck";
360364
power-domains = <&sysc R8A7779_PD_ALWAYS_ON>;
@@ -370,6 +374,7 @@
370374
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
371375
<GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,
372376
<GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
377+
interrupt-names = "tuni0", "tuni1", "tuni2";
373378
clocks = <&mstp0_clks R8A7779_CLK_TMU2>;
374379
clock-names = "fck";
375380
power-domains = <&sysc R8A7779_PD_ALWAYS_ON>;

‎arch/arm/boot/dts/r8a7790.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@
274274
compatible = "renesas,r8a7790-wdt",
275275
"renesas,rcar-gen2-wdt";
276276
reg = <0 0xe6020000 0 0x0c>;
277+
interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
277278
clocks = <&cpg CPG_MOD 402>;
278279
power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
279280
resets = <&cpg 402>;

‎arch/arm/boot/dts/r8a7791.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@
161161
compatible = "renesas,r8a7791-wdt",
162162
"renesas,rcar-gen2-wdt";
163163
reg = <0 0xe6020000 0 0x0c>;
164+
interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
164165
clocks = <&cpg CPG_MOD 402>;
165166
power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
166167
resets = <&cpg 402>;

‎arch/arm/boot/dts/r8a7792.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
compatible = "renesas,r8a7792-wdt",
112112
"renesas,rcar-gen2-wdt";
113113
reg = <0 0xe6020000 0 0x0c>;
114+
interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
114115
clocks = <&cpg CPG_MOD 402>;
115116
power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
116117
resets = <&cpg 402>;

0 commit comments

Comments
 (0)