ARM: dts: sunxi: Rename nmi_intc to r_intc

The R_INTC block controls more than just the NMI, and it is a different
hardware block than the NMI INTC found in some other Allwinner SoCs, so
the label "nmi_intc" is inaccurate. Name it "r_intc" to match the
compatible and to match the few references in the vendor documentation.

Signed-off-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20210118055040.21910-6-samuel@sholland.org

diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
index 73de34ae37fdceb3152cbc886246b38142e93a5a..486cec6f71e0954b1f7ec976f7a6cb4301333723 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
+++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
@@ -226,7 +226,7 @@
        axp22x: pmic@68 {
                compatible = "x-powers,axp221";
                reg = <0x68>;
-               interrupt-parent = <&nmi_intc>;
+               interrupt-parent = <&r_intc>;
                interrupts = <0 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 aff716b523c4aa297cc387188d63da5d4375587c..e4f3415e6108c910ac222d24ca3ae9fdb1acbd27 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-m9.dts
+++ b/arch/arm/boot/dts/sun6i-a31-m9.dts
@@ -115,7 +115,7 @@
        axp22x: pmic@68 {
                compatible = "x-powers,axp221";
                reg = <0x68>;
-               interrupt-parent = <&nmi_intc>;
+               interrupt-parent = <&r_intc>;
                interrupts = <0 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 959ed9ce4b483f50e1ee508eefc43af5ae637e7f..7bd4bdd66a76cadd64fe0b64c8c95d155a106c79 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
+++ b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
@@ -115,7 +115,7 @@
        axp22x: pmic@68 {
                compatible = "x-powers,axp221";
                reg = <0x68>;
-               interrupt-parent = <&nmi_intc>;
+               interrupt-parent = <&r_intc>;
                interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
        };
 };

diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index 92fd47c54d73011618a57e6fa2b1c5b4583794d7..a75033e85fcb69d3a09c091ae08edb2a08604d69 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -1305,7 +1305,7 @@
                        clock-output-names = "osc32k";
                };
 
-               nmi_intc: interrupt-controller@1f00c00 {
+               r_intc: interrupt-controller@1f00c00 {
                        compatible = "allwinner,sun6i-a31-r-intc";
                        interrupt-controller;
                        #interrupt-cells = <2>;

diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
index 0e1ee5ff2c2b59c8f0ef9bf571ffd31166fb67cd..66bc6ca77afbac3756b11a02136294af4eb788b0 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31s-primo81.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
@@ -158,7 +158,7 @@
        axp22x: pmic@68 {
                compatible = "x-powers,axp221";
                reg = <0x68>;
-               interrupt-parent = <&nmi_intc>;
+               interrupt-parent = <&r_intc>;
                interrupts = <0 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 3099491de8c4e50797a95e70abf093731c191c84..7455c0db4a8ae8a40f3a55fab0ffd7cf34bfe642 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi
@@ -78,7 +78,7 @@
        axp22x: pmic@68 {
                compatible = "x-powers,axp221";
                reg = <0x68>;
-               interrupt-parent = <&nmi_intc>;
+               interrupt-parent = <&r_intc>;
                interrupts = <0 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 b4ce60a3b19441497db48c44cb325edb41113209..efb25b949f30345beb87dae2a7994232851c4a01 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
@@ -148,7 +148,7 @@
        axp22x: pmic@68 {
                compatible = "x-powers,axp221";
                reg = <0x68>;
-               interrupt-parent = <&nmi_intc>;
+               interrupt-parent = <&r_intc>;
                interrupts = <0 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 2504e7189c5474361428b64b2729415bbb889f4f..cadc45255d7b9f8adc832a9837aba3f3879e10c4 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
@@ -98,7 +98,7 @@
        axp22x: pmic@68 {
                compatible = "x-powers,axp221";
                reg = <0x68>;
-               interrupt-parent = <&nmi_intc>;
+               interrupt-parent = <&r_intc>;
                interrupts = <0 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 7de2abd541c12f84a493c1f095ef97afad0290c3..6bf3fbdd738f9c84fcd06886891e80af118cadc0 100644 (file)
--- a/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
@@ -79,7 +79,7 @@
        axp22x: pmic@68 {
                compatible = "x-powers,axp221";
                reg = <0x68>;
-               interrupt-parent = <&nmi_intc>;
+               interrupt-parent = <&r_intc>;
                interrupts = <0 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 c1362d0f0ff8e8281f9798edb04dc60b9f5faf9d..a42fac676b3119af04a533ade4b22b1ff591db99 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
@@ -716,7 +716,7 @@
                        #clock-cells = <1>;
                };
 
-               nmi_intc: interrupt-controller@1f00c00 {
+               r_intc: interrupt-controller@1f00c00 {
                        compatible = "allwinner,sun6i-a31-r-intc";
                        interrupt-controller;
                        #interrupt-cells = <2>;

diff --git a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
index 9adf58f866d68a8bd6588b0cdd52fa5f0e405d2e..8538514c85886da9968acd7e7b6f4ccb9b3b6df3 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
+++ b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
@@ -98,7 +98,7 @@
        axp22x: pmic@3a3 {
                compatible = "x-powers,axp223";
                reg = <0x3a3>;
-               interrupt-parent = <&nmi_intc>;
+               interrupt-parent = <&r_intc>;
                interrupts = <0 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 a1f28e71aae498855fe0e0e90004262921bec4ea..d54a067fc76e85e1fa880f50722c5a5d980defaf 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
+++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
@@ -165,7 +165,7 @@
        axp22x: pmic@3a3 {
                compatible = "x-powers,axp223";
                reg = <0x3a3>;
-               interrupt-parent = <&nmi_intc>;
+               interrupt-parent = <&r_intc>;
                interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
                eldoin-supply = <&reg_dcdc1>;
        };

diff --git a/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
index 015ba66fd277d8204e3f5ecb972b4cb2cd57ca37..293016d081cd882a985971633ae9f17a0ff352ce 100644 (file)
--- a/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
+++ b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
@@ -163,7 +163,7 @@
        axp22x: pmic@3a3 {
                compatible = "x-powers,axp223";
                reg = <0x3a3>;
-               interrupt-parent = <&nmi_intc>;
+               interrupt-parent = <&r_intc>;
                interrupts = <0 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 09a6a3b2cccc0fb7fedb1e87f53d0742b9835c6f..2be1b76fe2f67719cbfb738ab015f1e751a4e6e4 100644 (file)
--- a/arch/arm/boot/dts/sun8i-r16-parrot.dts
+++ b/arch/arm/boot/dts/sun8i-r16-parrot.dts
@@ -164,7 +164,7 @@
        axp22x: pmic@3a3 {
                compatible = "x-powers,axp223";
                reg = <0x3a3>;
-               interrupt-parent = <&nmi_intc>;
+               interrupt-parent = <&r_intc>;
                interrupts = <0 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 daf4be6416df04c1738325f012f109ce6347ed9b..797d61cff11e3ab933fd9646e62a2d757da721d8 100644 (file)
--- a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
@@ -93,7 +93,7 @@
        axp22x: pmic@3a3 {
                compatible = "x-powers,axp223";
                reg = <0x3a3>;
-               interrupt-parent = <&nmi_intc>;
+               interrupt-parent = <&r_intc>;
                interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
                eldoin-supply = <&reg_dcdc1>;
                drivevbus-supply = <&reg_vcc5v0>;