Skip to content

Commit 77489a4

Browse files
committed
Merge tag 'renesas-fixes-for-v6.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/fixes
Renesas fixes for v6.5 - Fix interrupt names for MTU3 channels on RZ/G2L and RZ/V2L. * tag 'renesas-fixes-for-v6.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: arm64: dts: renesas: rzg2l: Update overfow/underflow IRQ names for MTU3 channels Link: https://lore.kernel.org/r/cover.1690463347.git.geert+renesas@glider.be Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents b1e0529 + 4c188fa commit 77489a4

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

arch/arm64/boot/dts/renesas/r9a07g044.dtsi

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -223,20 +223,20 @@
223223
<GIC_SPI 212 IRQ_TYPE_EDGE_RISING>,
224224
<GIC_SPI 213 IRQ_TYPE_EDGE_RISING>;
225225
interrupt-names = "tgia0", "tgib0", "tgic0", "tgid0",
226-
"tgiv0", "tgie0", "tgif0",
227-
"tgia1", "tgib1", "tgiv1", "tgiu1",
228-
"tgia2", "tgib2", "tgiv2", "tgiu2",
226+
"tciv0", "tgie0", "tgif0",
227+
"tgia1", "tgib1", "tciv1", "tciu1",
228+
"tgia2", "tgib2", "tciv2", "tciu2",
229229
"tgia3", "tgib3", "tgic3", "tgid3",
230-
"tgiv3",
230+
"tciv3",
231231
"tgia4", "tgib4", "tgic4", "tgid4",
232-
"tgiv4",
232+
"tciv4",
233233
"tgiu5", "tgiv5", "tgiw5",
234234
"tgia6", "tgib6", "tgic6", "tgid6",
235-
"tgiv6",
235+
"tciv6",
236236
"tgia7", "tgib7", "tgic7", "tgid7",
237-
"tgiv7",
237+
"tciv7",
238238
"tgia8", "tgib8", "tgic8", "tgid8",
239-
"tgiv8", "tgiu8";
239+
"tciv8", "tciu8";
240240
clocks = <&cpg CPG_MOD R9A07G044_MTU_X_MCK_MTU3>;
241241
power-domains = <&cpg>;
242242
resets = <&cpg R9A07G044_MTU_X_PRESET_MTU3>;

arch/arm64/boot/dts/renesas/r9a07g054.dtsi

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -223,20 +223,20 @@
223223
<GIC_SPI 212 IRQ_TYPE_EDGE_RISING>,
224224
<GIC_SPI 213 IRQ_TYPE_EDGE_RISING>;
225225
interrupt-names = "tgia0", "tgib0", "tgic0", "tgid0",
226-
"tgiv0", "tgie0", "tgif0",
227-
"tgia1", "tgib1", "tgiv1", "tgiu1",
228-
"tgia2", "tgib2", "tgiv2", "tgiu2",
226+
"tciv0", "tgie0", "tgif0",
227+
"tgia1", "tgib1", "tciv1", "tciu1",
228+
"tgia2", "tgib2", "tciv2", "tciu2",
229229
"tgia3", "tgib3", "tgic3", "tgid3",
230-
"tgiv3",
230+
"tciv3",
231231
"tgia4", "tgib4", "tgic4", "tgid4",
232-
"tgiv4",
232+
"tciv4",
233233
"tgiu5", "tgiv5", "tgiw5",
234234
"tgia6", "tgib6", "tgic6", "tgid6",
235-
"tgiv6",
235+
"tciv6",
236236
"tgia7", "tgib7", "tgic7", "tgid7",
237-
"tgiv7",
237+
"tciv7",
238238
"tgia8", "tgib8", "tgic8", "tgid8",
239-
"tgiv8", "tgiu8";
239+
"tciv8", "tciu8";
240240
clocks = <&cpg CPG_MOD R9A07G054_MTU_X_MCK_MTU3>;
241241
power-domains = <&cpg>;
242242
resets = <&cpg R9A07G054_MTU_X_PRESET_MTU3>;

0 commit comments

Comments
 (0)