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>
This commit is contained in:
parent
a38fd87484
commit
9fdef3c3d8
|
@ -227,7 +227,7 @@
|
||||||
compatible = "x-powers,axp221";
|
compatible = "x-powers,axp221";
|
||||||
reg = <0x68>;
|
reg = <0x68>;
|
||||||
interrupt-parent = <&r_intc>;
|
interrupt-parent = <&r_intc>;
|
||||||
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
||||||
x-powers,drive-vbus-en;
|
x-powers,drive-vbus-en;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -116,7 +116,7 @@
|
||||||
compatible = "x-powers,axp221";
|
compatible = "x-powers,axp221";
|
||||||
reg = <0x68>;
|
reg = <0x68>;
|
||||||
interrupt-parent = <&r_intc>;
|
interrupt-parent = <&r_intc>;
|
||||||
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -116,7 +116,7 @@
|
||||||
compatible = "x-powers,axp221";
|
compatible = "x-powers,axp221";
|
||||||
reg = <0x68>;
|
reg = <0x68>;
|
||||||
interrupt-parent = <&r_intc>;
|
interrupt-parent = <&r_intc>;
|
||||||
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1308,7 +1308,7 @@
|
||||||
r_intc: interrupt-controller@1f00c00 {
|
r_intc: interrupt-controller@1f00c00 {
|
||||||
compatible = "allwinner,sun6i-a31-r-intc";
|
compatible = "allwinner,sun6i-a31-r-intc";
|
||||||
interrupt-controller;
|
interrupt-controller;
|
||||||
#interrupt-cells = <2>;
|
#interrupt-cells = <3>;
|
||||||
reg = <0x01f00c00 0x400>;
|
reg = <0x01f00c00 0x400>;
|
||||||
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
};
|
};
|
||||||
|
|
|
@ -159,7 +159,7 @@
|
||||||
compatible = "x-powers,axp221";
|
compatible = "x-powers,axp221";
|
||||||
reg = <0x68>;
|
reg = <0x68>;
|
||||||
interrupt-parent = <&r_intc>;
|
interrupt-parent = <&r_intc>;
|
||||||
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
||||||
x-powers,drive-vbus-en;
|
x-powers,drive-vbus-en;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -79,7 +79,7 @@
|
||||||
compatible = "x-powers,axp221";
|
compatible = "x-powers,axp221";
|
||||||
reg = <0x68>;
|
reg = <0x68>;
|
||||||
interrupt-parent = <&r_intc>;
|
interrupt-parent = <&r_intc>;
|
||||||
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -149,7 +149,7 @@
|
||||||
compatible = "x-powers,axp221";
|
compatible = "x-powers,axp221";
|
||||||
reg = <0x68>;
|
reg = <0x68>;
|
||||||
interrupt-parent = <&r_intc>;
|
interrupt-parent = <&r_intc>;
|
||||||
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
||||||
eldoin-supply = <®_dcdc1>;
|
eldoin-supply = <®_dcdc1>;
|
||||||
x-powers,drive-vbus-en;
|
x-powers,drive-vbus-en;
|
||||||
};
|
};
|
||||||
|
|
|
@ -99,7 +99,7 @@
|
||||||
compatible = "x-powers,axp221";
|
compatible = "x-powers,axp221";
|
||||||
reg = <0x68>;
|
reg = <0x68>;
|
||||||
interrupt-parent = <&r_intc>;
|
interrupt-parent = <&r_intc>;
|
||||||
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -80,7 +80,7 @@
|
||||||
compatible = "x-powers,axp221";
|
compatible = "x-powers,axp221";
|
||||||
reg = <0x68>;
|
reg = <0x68>;
|
||||||
interrupt-parent = <&r_intc>;
|
interrupt-parent = <&r_intc>;
|
||||||
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
||||||
drivevbus-supply = <®_vcc5v0>;
|
drivevbus-supply = <®_vcc5v0>;
|
||||||
x-powers,drive-vbus-en;
|
x-powers,drive-vbus-en;
|
||||||
};
|
};
|
||||||
|
|
|
@ -719,7 +719,7 @@
|
||||||
r_intc: interrupt-controller@1f00c00 {
|
r_intc: interrupt-controller@1f00c00 {
|
||||||
compatible = "allwinner,sun6i-a31-r-intc";
|
compatible = "allwinner,sun6i-a31-r-intc";
|
||||||
interrupt-controller;
|
interrupt-controller;
|
||||||
#interrupt-cells = <2>;
|
#interrupt-cells = <3>;
|
||||||
reg = <0x01f00c00 0x400>;
|
reg = <0x01f00c00 0x400>;
|
||||||
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
};
|
};
|
||||||
|
|
|
@ -99,7 +99,7 @@
|
||||||
compatible = "x-powers,axp223";
|
compatible = "x-powers,axp223";
|
||||||
reg = <0x3a3>;
|
reg = <0x3a3>;
|
||||||
interrupt-parent = <&r_intc>;
|
interrupt-parent = <&r_intc>;
|
||||||
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
||||||
eldoin-supply = <®_dcdc1>;
|
eldoin-supply = <®_dcdc1>;
|
||||||
x-powers,drive-vbus-en;
|
x-powers,drive-vbus-en;
|
||||||
};
|
};
|
||||||
|
|
|
@ -166,7 +166,7 @@
|
||||||
compatible = "x-powers,axp223";
|
compatible = "x-powers,axp223";
|
||||||
reg = <0x3a3>;
|
reg = <0x3a3>;
|
||||||
interrupt-parent = <&r_intc>;
|
interrupt-parent = <&r_intc>;
|
||||||
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
||||||
eldoin-supply = <®_dcdc1>;
|
eldoin-supply = <®_dcdc1>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -122,7 +122,7 @@
|
||||||
compatible = "x-powers,axp818", "x-powers,axp813";
|
compatible = "x-powers,axp818", "x-powers,axp813";
|
||||||
reg = <0x3a3>;
|
reg = <0x3a3>;
|
||||||
interrupt-parent = <&r_intc>;
|
interrupt-parent = <&r_intc>;
|
||||||
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
||||||
eldoin-supply = <®_dcdc1>;
|
eldoin-supply = <®_dcdc1>;
|
||||||
swin-supply = <®_dcdc1>;
|
swin-supply = <®_dcdc1>;
|
||||||
};
|
};
|
||||||
|
@ -142,7 +142,7 @@
|
||||||
ac100_rtc: rtc {
|
ac100_rtc: rtc {
|
||||||
compatible = "x-powers,ac100-rtc";
|
compatible = "x-powers,ac100-rtc";
|
||||||
interrupt-parent = <&r_intc>;
|
interrupt-parent = <&r_intc>;
|
||||||
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
||||||
clocks = <&ac100_codec>;
|
clocks = <&ac100_codec>;
|
||||||
#clock-cells = <1>;
|
#clock-cells = <1>;
|
||||||
clock-output-names = "cko1_rtc",
|
clock-output-names = "cko1_rtc",
|
||||||
|
|
|
@ -203,7 +203,7 @@
|
||||||
compatible = "x-powers,axp813";
|
compatible = "x-powers,axp813";
|
||||||
reg = <0x3a3>;
|
reg = <0x3a3>;
|
||||||
interrupt-parent = <&r_intc>;
|
interrupt-parent = <&r_intc>;
|
||||||
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
||||||
eldoin-supply = <®_dcdc1>;
|
eldoin-supply = <®_dcdc1>;
|
||||||
fldoin-supply = <®_dcdc5>;
|
fldoin-supply = <®_dcdc5>;
|
||||||
swin-supply = <®_dcdc1>;
|
swin-supply = <®_dcdc1>;
|
||||||
|
@ -225,7 +225,7 @@
|
||||||
ac100_rtc: rtc {
|
ac100_rtc: rtc {
|
||||||
compatible = "x-powers,ac100-rtc";
|
compatible = "x-powers,ac100-rtc";
|
||||||
interrupt-parent = <&r_intc>;
|
interrupt-parent = <&r_intc>;
|
||||||
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
||||||
clocks = <&ac100_codec>;
|
clocks = <&ac100_codec>;
|
||||||
#clock-cells = <1>;
|
#clock-cells = <1>;
|
||||||
clock-output-names = "cko1_rtc",
|
clock-output-names = "cko1_rtc",
|
||||||
|
|
|
@ -239,7 +239,7 @@
|
||||||
compatible = "x-powers,axp818", "x-powers,axp813";
|
compatible = "x-powers,axp818", "x-powers,axp813";
|
||||||
reg = <0x3a3>;
|
reg = <0x3a3>;
|
||||||
interrupt-parent = <&r_intc>;
|
interrupt-parent = <&r_intc>;
|
||||||
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
||||||
eldoin-supply = <®_dcdc1>;
|
eldoin-supply = <®_dcdc1>;
|
||||||
swin-supply = <®_dcdc1>;
|
swin-supply = <®_dcdc1>;
|
||||||
x-powers,drive-vbus-en;
|
x-powers,drive-vbus-en;
|
||||||
|
@ -260,7 +260,7 @@
|
||||||
ac100_rtc: rtc {
|
ac100_rtc: rtc {
|
||||||
compatible = "x-powers,ac100-rtc";
|
compatible = "x-powers,ac100-rtc";
|
||||||
interrupt-parent = <&r_intc>;
|
interrupt-parent = <&r_intc>;
|
||||||
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
||||||
clocks = <&ac100_codec>;
|
clocks = <&ac100_codec>;
|
||||||
#clock-cells = <1>;
|
#clock-cells = <1>;
|
||||||
clock-output-names = "cko1_rtc",
|
clock-output-names = "cko1_rtc",
|
||||||
|
|
|
@ -263,7 +263,7 @@
|
||||||
compatible = "x-powers,axp813";
|
compatible = "x-powers,axp813";
|
||||||
reg = <0x3a3>;
|
reg = <0x3a3>;
|
||||||
interrupt-parent = <&r_intc>;
|
interrupt-parent = <&r_intc>;
|
||||||
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
||||||
swin-supply = <®_dcdc1>;
|
swin-supply = <®_dcdc1>;
|
||||||
x-powers,drive-vbus-en;
|
x-powers,drive-vbus-en;
|
||||||
};
|
};
|
||||||
|
@ -283,7 +283,7 @@
|
||||||
ac100_rtc: rtc {
|
ac100_rtc: rtc {
|
||||||
compatible = "x-powers,ac100-rtc";
|
compatible = "x-powers,ac100-rtc";
|
||||||
interrupt-parent = <&r_intc>;
|
interrupt-parent = <&r_intc>;
|
||||||
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
||||||
clocks = <&ac100_codec>;
|
clocks = <&ac100_codec>;
|
||||||
#clock-cells = <1>;
|
#clock-cells = <1>;
|
||||||
clock-output-names = "cko1_rtc",
|
clock-output-names = "cko1_rtc",
|
||||||
|
|
|
@ -1111,7 +1111,7 @@
|
||||||
compatible = "allwinner,sun8i-a83t-r-intc",
|
compatible = "allwinner,sun8i-a83t-r-intc",
|
||||||
"allwinner,sun6i-a31-r-intc";
|
"allwinner,sun6i-a31-r-intc";
|
||||||
interrupt-controller;
|
interrupt-controller;
|
||||||
#interrupt-cells = <2>;
|
#interrupt-cells = <3>;
|
||||||
reg = <0x01f00c00 0x400>;
|
reg = <0x01f00c00 0x400>;
|
||||||
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
};
|
};
|
||||||
|
|
|
@ -164,7 +164,7 @@
|
||||||
compatible = "x-powers,axp223";
|
compatible = "x-powers,axp223";
|
||||||
reg = <0x3a3>;
|
reg = <0x3a3>;
|
||||||
interrupt-parent = <&r_intc>;
|
interrupt-parent = <&r_intc>;
|
||||||
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
||||||
eldoin-supply = <®_dcdc1>;
|
eldoin-supply = <®_dcdc1>;
|
||||||
x-powers,drive-vbus-en;
|
x-powers,drive-vbus-en;
|
||||||
};
|
};
|
||||||
|
|
|
@ -165,7 +165,7 @@
|
||||||
compatible = "x-powers,axp223";
|
compatible = "x-powers,axp223";
|
||||||
reg = <0x3a3>;
|
reg = <0x3a3>;
|
||||||
interrupt-parent = <&r_intc>;
|
interrupt-parent = <&r_intc>;
|
||||||
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
||||||
drivevbus-supply = <®_vcc5v0>;
|
drivevbus-supply = <®_vcc5v0>;
|
||||||
x-powers,drive-vbus-en;
|
x-powers,drive-vbus-en;
|
||||||
};
|
};
|
||||||
|
|
|
@ -94,7 +94,7 @@
|
||||||
compatible = "x-powers,axp223";
|
compatible = "x-powers,axp223";
|
||||||
reg = <0x3a3>;
|
reg = <0x3a3>;
|
||||||
interrupt-parent = <&r_intc>;
|
interrupt-parent = <&r_intc>;
|
||||||
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
|
||||||
eldoin-supply = <®_dcdc1>;
|
eldoin-supply = <®_dcdc1>;
|
||||||
drivevbus-supply = <®_vcc5v0>;
|
drivevbus-supply = <®_vcc5v0>;
|
||||||
x-powers,drive-vbus-en;
|
x-powers,drive-vbus-en;
|
||||||
|
|
Loading…
Reference in New Issue