arm64: dts: allwinner: Use the new r_intc binding

The binding of R_INTC was updated to allow specifying interrupts other
than the external NMI, since routing those interrupts through the R_INTC
driver allows using them for wakeup.

Update the device trees to use the new binding.

Acked-by: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Chen-Yu Tsai <wens@csie.org>

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts
index c7bd73f..f17cc89 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts
@@ -173,7 +173,7 @@
                compatible = "x-powers,axp803";
                reg = <0x3a3>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                x-powers,drive-vbus-en; /* set N_VBUSEN as output pin */
        };
 };

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
index f7fe9fa..997a193 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
@@ -191,7 +191,7 @@
                compatible = "x-powers,axp803";
                reg = <0x3a3>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                x-powers,drive-vbus-en; /* set N_VBUSEN as output pin */
        };
 };

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts
index 09b3c7f..e47ff06 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts
@@ -152,7 +152,7 @@
                compatible = "x-powers,axp803";
                reg = <0x3a3>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
index f3f8e17..ec7e2c0 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
@@ -185,7 +185,7 @@
                compatible = "x-powers,axp803";
                reg = <0x3a3>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                x-powers,drive-vbus-en; /* set N_VBUSEN as output pin */
        };
 };

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
index 70e3174..097a551 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
@@ -192,7 +192,7 @@
                compatible = "x-powers,axp803";
                reg = <0x3a3>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                x-powers,drive-vbus-en; /* set N_VBUSEN as output pin */
        };
 };

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
index 329cf27..2accb5d 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
@@ -139,7 +139,7 @@
                compatible = "x-powers,axp803";
                reg = <0x3a3>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
index 7ae1654..34e67f5 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
@@ -245,7 +245,7 @@
                compatible = "x-powers,axp803";
                reg = <0x3a3>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
index 9f69d48..79adea3 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
@@ -296,7 +296,7 @@
                compatible = "x-powers,axp803";
                reg = <0x3a3>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
index 422a850..7ef96f9 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
@@ -266,7 +266,7 @@
                compatible = "x-powers,axp803";
                reg = <0x3a3>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                x-powers,drive-vbus-en;
        };
 };

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
index 3402cec..5030807 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
@@ -45,7 +45,7 @@
                compatible = "x-powers,axp803";
                reg = <0x3a3>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts
index f0a16f3..45e1abd 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts
@@ -205,7 +205,7 @@
                compatible = "x-powers,axp803";
                reg = <0x3a3>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                wakeup-source;
        };
 };

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index 57786fc..5bf9d61 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -1219,7 +1219,7 @@
                        compatible = "allwinner,sun50i-a64-r-intc",
                                     "allwinner,sun6i-a31-r-intc";
                        interrupt-controller;
-                       #interrupt-cells = <2>;
+                       #interrupt-cells = <3>;
                        reg = <0x01f00c00 0x400>;
                        interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
                };

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
index 4f47551..c42b2ab 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
@@ -157,7 +157,7 @@
                compatible = "x-powers,axp805", "x-powers,axp806";
                reg = <0x36>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
                interrupt-controller;
                #interrupt-cells = <1>;
                x-powers,self-working-mode;

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
index 7e83f61..1933964 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
@@ -182,7 +182,7 @@
                compatible = "x-powers,axp805", "x-powers,axp806";
                reg = <0x36>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
                interrupt-controller;
                #interrupt-cells = <1>;
                x-powers,self-working-mode;

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
index da0875b..4ec4996 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
@@ -119,7 +119,7 @@
                compatible = "x-powers,axp805", "x-powers,axp806";
                reg = <0x36>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
                interrupt-controller;
                #interrupt-cells = <1>;
                x-powers,self-working-mode;

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
index b868ad1..1ffd68f 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
@@ -168,7 +168,7 @@
                compatible = "x-powers,axp805", "x-powers,axp806";
                reg = <0x36>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
                interrupt-controller;
                #interrupt-cells = <1>;
                x-powers,self-working-mode;
@@ -281,7 +281,7 @@
                compatible = "nxp,pcf8563";
                reg = <0x51>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
                #clock-cells = <0>;
        };
 };

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
index 49e9797..d395e50 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
@@ -927,10 +927,9 @@
                };
 
                r_intc: interrupt-controller@7021000 {
-                       compatible = "allwinner,sun50i-h6-r-intc",
-                                    "allwinner,sun6i-a31-r-intc";
+                       compatible = "allwinner,sun50i-h6-r-intc";
                        interrupt-controller;
-                       #interrupt-cells = <2>;
+                       #interrupt-cells = <3>;
                        reg = <0x07021000 0x400>;
                        interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
                };