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 c7bd73f35ed89e917e2060d61aefd8b1603721c3..f17cc89f472d9479ba69c096877c98061655a74b 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 f7fe9fa50cb39ec1a1018c74e4d46d0f6dc3c669..997a193726836b62ad7204ab989198dafbc5ae69 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 09b3c7fb82c00917d0040e769f2536dcdfe3fe0f..e47ff06a6fa9990b2d2f0b4de59b2b55de02d20b 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 f3f8e177ab610352846905ec7a4edffb8341c2df..ec7e2c0e82c1911ac30cf3e515418e7e31f612e4 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 70e31743f0bacbcd5cf1b9e384f2a8319bae80a8..097a5511523ad54eff05d8dc8efcb2db84196f97 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 329cf276561e896bbc193eb26208d4348e03c74d..2accb5ddf783359e3de69d155edb0c4cf479e66a 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 7ae16541d14f5f738901d86c57997c3b72f5f659..34e67f5f829794fde53be977d601f2adf7c108d2 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 9f69d489a81de906f7086e771b6d12b972a80e92..79adea3f8cc16aaf42f64568f164d35d4251b209 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 422a8507f674fc7e1dd1d6365225af76275d1926..7ef96f9ff7aed0ec02bc2b7c2c27b6958e50c307 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 3402cec87035bbea4ee851482323d99b4191c94c..50308077ea8c46b322d8ad02c07b931638efe739 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 f0a16f355e270619b8afb14d1b45f23b3e166a5e..45e1abdf70a05fffd6eeda6a97a3957012cf090d 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 57786fc120c30b884c4509648c7ded86f2cc030c..5bf9d61fab121645a18a88910746ffe56b0e3f58 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 4f4755152fcea822da8318f2926e0ab54de95d48..c42b2abc1ad05b4d6a10fe3826372d30a89c4f37 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 7e83f6146f8a589f06fad2d1f5ec215a78217a8a..19339644a68a51315a07e37614417ba0650e9548 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 da0875bd38d40e2e5419bf5e8b0c577cc45714b2..4ec4996592befb5e58c522fe21dd60f294f3e86a 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 b868ad17af8fdad6563035996b82fb5da7bf7dcd..1ffd68f43f875845f245e60d17e8c02f932ed88d 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 49e979794094f415bb880883188bcce3b8bd2b34..d395e50912a5f2373930f6950d72213c686121cf 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>;
                };