Merge tag 'mips_5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

[linux-2.6-microblaze.git] / arch / arm / boot / dts / r7s9210.dtsi

diff --git a/arch/arm/boot/dts/r7s9210.dtsi b/arch/arm/boot/dts/r7s9210.dtsi
index 838920a..fdeb0bc 100644 (file)
--- a/arch/arm/boot/dts/r7s9210.dtsi
+++ b/arch/arm/boot/dts/r7s9210.dtsi
@@ -236,6 +236,8 @@
                                     <GIC_SPI 237 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 238 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 239 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "tei", "ri", "ti", "spi", "sti",
+                                         "naki", "ali", "tmoi";
                        clocks = <&cpg CPG_MOD 87>;
                        power-domains = <&cpg>;
                        clock-frequency = <100000>;
@@ -255,6 +257,8 @@
                                     <GIC_SPI 245 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "tei", "ri", "ti", "spi", "sti",
+                                         "naki", "ali", "tmoi";
                        clocks = <&cpg CPG_MOD 86>;
                        power-domains = <&cpg>;
                        clock-frequency = <100000>;
@@ -274,6 +278,8 @@
                                     <GIC_SPI 253 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 254 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 255 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "tei", "ri", "ti", "spi", "sti",
+                                         "naki", "ali", "tmoi";
                        clocks = <&cpg CPG_MOD 85>;
                        power-domains = <&cpg>;
                        clock-frequency = <100000>;
@@ -293,6 +299,8 @@
                                     <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 262 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 263 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "tei", "ri", "ti", "spi", "sti",
+                                         "naki", "ali", "tmoi";
                        clocks = <&cpg CPG_MOD 84>;
                        power-domains = <&cpg>;
                        clock-frequency = <100000>;
@@ -489,7 +497,7 @@
                        interrupt-map-mask = <7 0>;
                };
 
-               pinctrl: pin-controller@fcffe000 {
+               pinctrl: pinctrl@fcffe000 {
                        compatible = "renesas,r7s9210-pinctrl";
                        reg = <0xfcffe000 0x1000>;