Skip to content

Commit c3d941b

Browse files
author
Steve Dunnagan
committed
ARM: dts: renesas: Improve TMU interrupt descriptions
JIRA: https://issues.redhat.com/browse/RHEL-53987 commit c1ff917 Author: Geert Uytterhoeven <geert+renesas@glider.be> Date: Mon Jan 15 14:46:39 2024 +0100 ARM: dts: renesas: Improve TMU interrupt descriptions Add the input capture interrupt on Timer Unit instances that have it. Add "interrupt-names" properties for clarity. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Link: https://lore.kernel.org/r/389a18ee2cea96726462c28463cf212330f74ee3.1705325654.git.geert+renesas@glider.be Conflicts: This patch has not yet been merged into CS9: 724ba67(ARM: dts: Move .dts files to vendor sub-directories) That renames 2500+ files, and so will be backported separately. There is no conflict here, but note that CS9 does not yet have this file renaming: arch/arm/boot/dts/r8a7740.dtsi -> arch/arm/boot/dts/renesas/r8a7740.dtsi (cherry picked from commit c1ff917) Signed-off-by: Steve Dunnagan <sdunnaga@redhat.com>
1 parent 41dcf83 commit c3d941b

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
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/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>;

0 commit comments

Comments
 (0)