mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-08 04:12:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

ARM: dts: sunxi: Rename nmi_intc to r_intc

Browse Source 
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
This commit is contained in:
Samuel Holland
2021-01-17 23:50:35 -06:00
committed by Maxime Ripard
parent f0e4a3b192
commit 2977fcb7a9
15 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/sun6i-a31-hummingbird.dts
View File

@@ -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;
};

2
arch/arm/boot/dts/sun6i-a31-m9.dts
View File

@@ -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>;
};
};

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

@@ -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>;
};
};

2
arch/arm/boot/dts/sun6i-a31.dtsi
View File

@@ -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>;

2
arch/arm/boot/dts/sun6i-a31s-primo81.dts
View File

@@ -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;
};

2
arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi
View File

@@ -78,7 +78,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>;
};
};

2
arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
View File

@@ -148,7 +148,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>;
eldoin-supply = <&reg_dcdc1>;
x-powers,drive-vbus-en;

2
arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
View File

@@ -98,7 +98,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>;
};
};

2
arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
View File

@@ -79,7 +79,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>;
drivevbus-supply = <&reg_vcc5v0>;
x-powers,drive-vbus-en;

2
arch/arm/boot/dts/sun8i-a23-a33.dtsi
View File

@@ -716,7 +716,7 @@ rtc: rtc@1f00000 {
#clock-cells = <1>;
};
nmi_intc: interrupt-controller@1f00c00 {
r_intc: interrupt-controller@1f00c00 {
compatible = "allwinner,sun6i-a31-r-intc";
interrupt-controller;
#interrupt-cells = <2>;

2
arch/arm/boot/dts/sun8i-a33-olinuxino.dts
View File

@@ -98,7 +98,7 @@ &r_rsb {
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;

2
arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
View File

@@ -165,7 +165,7 @@ &r_rsb {
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>;
};

2
arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
View File

@@ -163,7 +163,7 @@ &r_rsb {
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;

2
arch/arm/boot/dts/sun8i-r16-parrot.dts
View File

@@ -164,7 +164,7 @@ &r_rsb {
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;

2
arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
View File

@@ -93,7 +93,7 @@ &r_rsb {
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>;