Commit 9fdef3c3 authored by Samuel Holland's avatar Samuel Holland Committed by Chen-Yu Tsai
Browse files

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: default avatarMaxime Ripard <mripard@kernel.org>
Signed-off-by: default avatarSamuel Holland <samuel@sholland.org>
Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
parent a38fd874

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

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ axp22x: pmic@68 { 
		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;

	};

};

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

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ axp22x: pmic@68 { 
		compatible = "x-powers,axp221";

		reg = <0x68>;

		interrupt-parent = <&r_intc>;

		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;

	};

};

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

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ axp22x: pmic@68 { 
		compatible = "x-powers,axp221";

		reg = <0x68>;

		interrupt-parent = <&r_intc>;

		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;

	};

};

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

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

		};

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

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ axp22x: pmic@68 { 
		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;

	};

};