1 files changed, 10 insertions, 23 deletions

diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index d0561d4c7c46..b517c8e6b420 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -15,6 +15,7 @@
 
 / {
         compatible = "renesas,r8a7779";
+        interrupt-parent = <&gic>;
 
         cpus {
                 #address-cells = <1>;
@@ -59,7 +60,6 @@
         gpio0: gpio@ffc40000 {
                 compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar";
                 reg = <0xffc40000 0x2c>;
-                interrupt-parent = <&gic>;
                 interrupts = <0 141 IRQ_TYPE_LEVEL_HIGH>;
                 #gpio-cells = <2>;
                 gpio-controller;
@@ -71,7 +71,6 @@
         gpio1: gpio@ffc41000 {
                 compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar";
                 reg = <0xffc41000 0x2c>;
-                interrupt-parent = <&gic>;
                 interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>;
                 #gpio-cells = <2>;
                 gpio-controller;
@@ -83,7 +82,6 @@
         gpio2: gpio@ffc42000 {
                 compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar";
                 reg = <0xffc42000 0x2c>;
-                interrupt-parent = <&gic>;
                 interrupts = <0 143 IRQ_TYPE_LEVEL_HIGH>;
                 #gpio-cells = <2>;
                 gpio-controller;
@@ -95,7 +93,6 @@
         gpio3: gpio@ffc43000 {
                 compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar";
                 reg = <0xffc43000 0x2c>;
-                interrupt-parent = <&gic>;
                 interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
                 #gpio-cells = <2>;
                 gpio-controller;
@@ -107,7 +104,6 @@
         gpio4: gpio@ffc44000 {
                 compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar";
                 reg = <0xffc44000 0x2c>;
-                interrupt-parent = <&gic>;
                 interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
                 #gpio-cells = <2>;
                 gpio-controller;
@@ -119,7 +115,6 @@
         gpio5: gpio@ffc45000 {
                 compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar";
                 reg = <0xffc45000 0x2c>;
-                interrupt-parent = <&gic>;
                 interrupts = <0 146 IRQ_TYPE_LEVEL_HIGH>;
                 #gpio-cells = <2>;
                 gpio-controller;
@@ -131,7 +126,6 @@
         gpio6: gpio@ffc46000 {
                 compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar";
                 reg = <0xffc46000 0x2c>;
-                interrupt-parent = <&gic>;
                 interrupts = <0 147 IRQ_TYPE_LEVEL_HIGH>;
                 #gpio-cells = <2>;
                 gpio-controller;
@@ -150,7 +144,6 @@
                         <0xfe780024 4>,
                         <0xfe780044 4>,
                         <0xfe780064 4>;
-                interrupt-parent = <&gic>;
                 interrupts = <0 27 IRQ_TYPE_LEVEL_HIGH
                               0 28 IRQ_TYPE_LEVEL_HIGH
                               0 29 IRQ_TYPE_LEVEL_HIGH
@@ -163,7 +156,6 @@
                 #size-cells = <0>;
                 compatible = "renesas,i2c-r8a7779";
                 reg = <0xffc70000 0x1000>;
-                interrupt-parent = <&gic>;
                 interrupts = <0 79 IRQ_TYPE_LEVEL_HIGH>;
                 status = "disabled";
         };
@@ -173,7 +165,6 @@
                 #size-cells = <0>;
                 compatible = "renesas,i2c-r8a7779";
                 reg = <0xffc71000 0x1000>;
-                interrupt-parent = <&gic>;
                 interrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>;
                 status = "disabled";
         };
@@ -183,7 +174,6 @@
                 #size-cells = <0>;
                 compatible = "renesas,i2c-r8a7779";
                 reg = <0xffc72000 0x1000>;
-                interrupt-parent = <&gic>;
                 interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>;
                 status = "disabled";
         };
@@ -193,7 +183,6 @@
                 #size-cells = <0>;
                 compatible = "renesas,i2c-r8a7779";
                 reg = <0xffc73000 0x1000>;
-                interrupt-parent = <&gic>;
                 interrupts = <0 81 IRQ_TYPE_LEVEL_HIGH>;
                 status = "disabled";
         };
@@ -211,14 +200,12 @@
         sata: sata@fc600000 {
                 compatible = "renesas,rcar-sata";
                 reg = <0xfc600000 0x2000>;
-                interrupt-parent = <&gic>;
                 interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>;
         };
 
         sdhi0: sd@ffe4c000 {
                 compatible = "renesas,sdhi-r8a7779";
                 reg = <0xffe4c000 0x100>;
-                interrupt-parent = <&gic>;
                 interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH>;
                 cap-sd-highspeed;
                 cap-sdio-irq;
@@ -228,7 +215,6 @@
         sdhi1: sd@ffe4d000 {
                 compatible = "renesas,sdhi-r8a7779";
                 reg = <0xffe4d000 0x100>;
-                interrupt-parent = <&gic>;
                 interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;
                 cap-sd-highspeed;
                 cap-sdio-irq;
@@ -238,7 +224,6 @@
         sdhi2: sd@ffe4e000 {
                 compatible = "renesas,sdhi-r8a7779";
                 reg = <0xffe4e000 0x100>;
-                interrupt-parent = <&gic>;
                 interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
                 cap-sd-highspeed;
                 cap-sdio-irq;
@@ -248,7 +233,6 @@
         sdhi3: sd@ffe4f000 {
                 compatible = "renesas,sdhi-r8a7779";
                 reg = <0xffe4f000 0x100>;
-                interrupt-parent = <&gic>;
                 interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;
                 cap-sd-highspeed;
                 cap-sdio-irq;
@@ -256,26 +240,29 @@
         };
 
         hspi0: spi@fffc7000 {
-                compatible = "renesas,hspi";
+                compatible = "renesas,hspi-r8a7779", "renesas,hspi";
                 reg = <0xfffc7000 0x18>;
-                interrupt-controller = <&gic>;
                 interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
                 status = "disabled";
         };
 
         hspi1: spi@fffc8000 {
-                compatible = "renesas,hspi";
+                compatible = "renesas,hspi-r8a7779", "renesas,hspi";
                 reg = <0xfffc8000 0x18>;
-                interrupt-controller = <&gic>;
                 interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
                 status = "disabled";
         };
 
         hspi2: spi@fffc6000 {
-                compatible = "renesas,hspi";
+                compatible = "renesas,hspi-r8a7779", "renesas,hspi";
                 reg = <0xfffc6000 0x18>;
-                interrupt-controller = <&gic>;
                 interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
                 status = "disabled";
         };
 };