Unverified Commit 2977fcb7 authored by Samuel Holland's avatar Samuel Holland Committed by Maxime Ripard
Browse files

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: default avatarSamuel Holland <samuel@sholland.org>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20210118055040.21910-6-samuel@sholland.org
parent f0e4a3b1

arch/arm/boot/dts/sun6i-a31-hummingbird.dts

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ &p2wi { 
	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;

	};

arch/arm/boot/dts/sun6i-a31-m9.dts

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ &p2wi { 
	axp22x: pmic@68 {

		compatible = "x-powers,axp221";

		reg = <0x68>;

		interrupt-parent = <&nmi_intc>;

		interrupt-parent = <&r_intc>;

		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

	};

};

arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ &p2wi { 
	axp22x: pmic@68 {

		compatible = "x-powers,axp221";

		reg = <0x68>;

		interrupt-parent = <&nmi_intc>;

		interrupt-parent = <&r_intc>;

		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

	};

};

arch/arm/boot/dts/sun6i-a31.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1305,7 +1305,7 @@ rtc: rtc@1f00000 { 
			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>;

arch/arm/boot/dts/sun6i-a31s-primo81.dts

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ &p2wi { 
	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;

	};