ARM: dts: sunxi: 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/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
index 486cec6f71e0954b1f7ec976f7a6cb4301333723..236ebfc061924bf694b6c897f872beb8c5d75d20 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
+++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
@@ -227,7 +227,7 @@
                compatible = "x-powers,axp221";
                reg = <0x68>;
                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/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-m9.dts
index e4f3415e6108c910ac222d24ca3ae9fdb1acbd27..7d2eaaf5c33e39a24369bf986eb4d4faa20ac445 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-m9.dts
+++ b/arch/arm/boot/dts/sun6i-a31-m9.dts
@@ -116,7 +116,7 @@
                compatible = "x-powers,axp221";
                reg = <0x68>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
index 7bd4bdd66a76cadd64fe0b64c8c95d155a106c79..83611434270cbc0d9b7c003b4b682e70af7fa97d 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
+++ b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
@@ -116,7 +116,7 @@
                compatible = "x-powers,axp221";
                reg = <0x68>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index a75033e85fcb69d3a09c091ae08edb2a08604d69..9532331af8ef0a7f2e1c4136e7bd0f8dfa6c8993 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -1308,7 +1308,7 @@
                r_intc: interrupt-controller@1f00c00 {
                        compatible = "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/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
index 66bc6ca77afbac3756b11a02136294af4eb788b0..b32b70ada7fd0ee433b066bf6f04179f37322a87 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31s-primo81.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
@@ -159,7 +159,7 @@
                compatible = "x-powers,axp221";
                reg = <0x68>;
                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/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi b/arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi
index 7455c0db4a8ae8a40f3a55fab0ffd7cf34bfe642..227ad489731c331404471c15e572617d0a38ce5f 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi
@@ -79,7 +79,7 @@
                compatible = "x-powers,axp221";
                reg = <0x68>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
index efb25b949f30345beb87dae2a7994232851c4a01..96554ab4f6d3373eac165bb72f6ddc215fe3d5fd 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
@@ -149,7 +149,7 @@
                compatible = "x-powers,axp221";
                reg = <0x68>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                eldoin-supply = <&reg_dcdc1>;
                x-powers,drive-vbus-en;
        };

diff --git a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
index cadc45255d7b9f8adc832a9837aba3f3879e10c4..0b61f5368d449294450acdead0f575bb5534d3ec 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
@@ -99,7 +99,7 @@
                compatible = "x-powers,axp221";
                reg = <0x68>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
index 6bf3fbdd738f9c84fcd06886891e80af118cadc0..f38d19c6be8cb480d0e0a42329496bdaf1c2ddb4 100644 (file)
--- a/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
@@ -80,7 +80,7 @@
                compatible = "x-powers,axp221";
                reg = <0x68>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                drivevbus-supply = <&reg_vcc5v0>;
                x-powers,drive-vbus-en;
        };

diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
index a42fac676b3119af04a533ade4b22b1ff591db99..a84c90a660ca0ae98f5b262373958aadfdd5a35b 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
@@ -719,7 +719,7 @@
                r_intc: interrupt-controller@1f00c00 {
                        compatible = "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/arm/boot/dts/sun8i-a33-olinuxino.dts b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
index 8538514c85886da9968acd7e7b6f4ccb9b3b6df3..6fee8f13350820a0c73dde13cc83b44e1b765336 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
+++ b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
@@ -99,7 +99,7 @@
                compatible = "x-powers,axp223";
                reg = <0x3a3>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                eldoin-supply = <&reg_dcdc1>;
                x-powers,drive-vbus-en;
        };

diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
index d54a067fc76e85e1fa880f50722c5a5d980defaf..0c82ff3c7cb485f21d908985ce2f8dbf7a70f50a 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
+++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
@@ -166,7 +166,7 @@
                compatible = "x-powers,axp223";
                reg = <0x3a3>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                eldoin-supply = <&reg_dcdc1>;
        };
 };

diff --git a/arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts b/arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts
index 9c006fc188217e608a2356885ed6a0293e7f1b99..c31c97d16024ca118c00c038bee141f194c1e341 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts
+++ b/arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts
@@ -122,7 +122,7 @@
                compatible = "x-powers,axp818", "x-powers,axp813";
                reg = <0x3a3>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                eldoin-supply = <&reg_dcdc1>;
                swin-supply = <&reg_dcdc1>;
        };
@@ -142,7 +142,7 @@
                ac100_rtc: rtc {
                        compatible = "x-powers,ac100-rtc";
                        interrupt-parent = <&r_intc>;
-                       interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+                       interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                        clocks = <&ac100_codec>;
                        #clock-cells = <1>;
                        clock-output-names = "cko1_rtc",

diff --git a/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts b/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
index b60016a4429c54ea9c69ac02be7c5b853a442c0b..5a7e1bd5f8258bf90816e577fe4940a0f3887b8a 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
+++ b/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
@@ -203,7 +203,7 @@
                compatible = "x-powers,axp813";
                reg = <0x3a3>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                eldoin-supply = <&reg_dcdc1>;
                fldoin-supply = <&reg_dcdc5>;
                swin-supply = <&reg_dcdc1>;
@@ -225,7 +225,7 @@
                ac100_rtc: rtc {
                        compatible = "x-powers,ac100-rtc";
                        interrupt-parent = <&r_intc>;
-                       interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+                       interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                        clocks = <&ac100_codec>;
                        #clock-cells = <1>;
                        clock-output-names = "cko1_rtc",

diff --git a/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts b/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
index e26af7cf10e0ce20c94990bb73767ceff09428f2..870993393fc2439953297003869052b28f6b4b5a 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
+++ b/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
@@ -239,7 +239,7 @@
                compatible = "x-powers,axp818", "x-powers,axp813";
                reg = <0x3a3>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                eldoin-supply = <&reg_dcdc1>;
                swin-supply = <&reg_dcdc1>;
                x-powers,drive-vbus-en;
@@ -260,7 +260,7 @@
                ac100_rtc: rtc {
                        compatible = "x-powers,ac100-rtc";
                        interrupt-parent = <&r_intc>;
-                       interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+                       interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                        clocks = <&ac100_codec>;
                        #clock-cells = <1>;
                        clock-output-names = "cko1_rtc",

diff --git a/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts b/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
index 83b01b03e08ebf0b027906993104cec2b3c2622d..7fe2a584ddf97722d00e203a4e5f76702fbeecec 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
+++ b/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
@@ -263,7 +263,7 @@
                compatible = "x-powers,axp813";
                reg = <0x3a3>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                swin-supply = <&reg_dcdc1>;
                x-powers,drive-vbus-en;
        };
@@ -283,7 +283,7 @@
                ac100_rtc: rtc {
                        compatible = "x-powers,ac100-rtc";
                        interrupt-parent = <&r_intc>;
-                       interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+                       interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                        clocks = <&ac100_codec>;
                        #clock-cells = <1>;
                        clock-output-names = "cko1_rtc",

diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi
index bd898b250e7405a9fbfae2ef292b526b07d873e3..335f4beda917e4be4668e977d25df392b9abc5e9 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a83t.dtsi
+++ b/arch/arm/boot/dts/sun8i-a83t.dtsi
@@ -1111,7 +1111,7 @@
                        compatible = "allwinner,sun8i-a83t-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/arm/boot/dts/sun8i-r16-bananapi-m2m.dts b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
index 293016d081cd882a985971633ae9f17a0ff352ce..bf5b5e2f6168beefaef40d67e25c9befae73ce85 100644 (file)
--- a/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
+++ b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
@@ -164,7 +164,7 @@
                compatible = "x-powers,axp223";
                reg = <0x3a3>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                eldoin-supply = <&reg_dcdc1>;
                x-powers,drive-vbus-en;
        };

diff --git a/arch/arm/boot/dts/sun8i-r16-parrot.dts b/arch/arm/boot/dts/sun8i-r16-parrot.dts
index 2be1b76fe2f67719cbfb738ab015f1e751a4e6e4..95543a9c21182fd74b02c9cb746563edb29855d2 100644 (file)
--- a/arch/arm/boot/dts/sun8i-r16-parrot.dts
+++ b/arch/arm/boot/dts/sun8i-r16-parrot.dts
@@ -165,7 +165,7 @@
                compatible = "x-powers,axp223";
                reg = <0x3a3>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                drivevbus-supply = <&reg_vcc5v0>;
                x-powers,drive-vbus-en;
        };

diff --git a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
index 797d61cff11e3ab933fd9646e62a2d757da721d8..872d56caa9ce7f91ccaeb4460835583fe4d0f4f8 100644 (file)
--- a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
@@ -94,7 +94,7 @@
                compatible = "x-powers,axp223";
                reg = <0x3a3>;
                interrupt-parent = <&r_intc>;
-               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                eldoin-supply = <&reg_dcdc1>;
                drivevbus-supply = <&reg_vcc5v0>;
                x-powers,drive-vbus-en;