Commit 189bef23 authored by Samuel Holland's avatar Samuel Holland Committed by Chen-Yu Tsai
Browse files

arm64: dts: allwinner: Move wakeup-capable IRQs to r_intc 



All IRQs that can be used to wake up the system must be routed through
r_intc, so they are visible to firmware while the system is suspended.

In addition to the external NMI input, which is already routed through
r_intc, these include PIO and R_PIO (gpio-keys), the LRADC, and the RTC.

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 73088dfe

arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -648,6 +648,7 @@ ccu: clock@1c20000 { 
		pio: pinctrl@1c20800 {

			compatible = "allwinner,sun50i-a64-pinctrl";

			reg = <0x01c20800 0x400>;

			interrupt-parent = <&r_intc>;

			interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
@@ -818,6 +819,7 @@ lradc: lradc@1c21800 { 
			compatible = "allwinner,sun50i-a64-lradc",

				     "allwinner,sun8i-a83t-r-lradc";

			reg = <0x01c21800 0x400>;

			interrupt-parent = <&r_intc>;

			interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};
@@ -1208,6 +1210,7 @@ rtc: rtc@1f00000 { 
			compatible = "allwinner,sun50i-a64-rtc",

				     "allwinner,sun8i-h3-rtc";

			reg = <0x01f00000 0x400>;

			interrupt-parent = <&r_intc>;

			interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;

			clock-output-names = "osc32k", "osc32k-out", "iosc";
@@ -1279,6 +1282,7 @@ r_pwm: pwm@1f03800 { 
		r_pio: pinctrl@1f02c00 {

			compatible = "allwinner,sun50i-a64-r-pinctrl";

			reg = <0x01f02c00 0x400>;

			interrupt-parent = <&r_intc>;

			interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&r_ccu CLK_APB0_PIO>, <&osc24M>, <&osc32k>;

			clock-names = "apb", "hosc", "losc";

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ pwm: pwm@300a000 { 
		pio: pinctrl@300b000 {

			compatible = "allwinner,sun50i-h6-pinctrl";

			reg = <0x0300b000 0x400>;

			interrupt-parent = <&r_intc>;

			interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
@@ -902,6 +903,7 @@ tcon_tv_out_tcon_top: endpoint@1 { 
		rtc: rtc@7000000 {

			compatible = "allwinner,sun50i-h6-rtc";

			reg = <0x07000000 0x400>;

			interrupt-parent = <&r_intc>;

			interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;

			clock-output-names = "osc32k", "osc32k-out", "iosc";
@@ -937,6 +939,7 @@ r_intc: interrupt-controller@7021000 { 
		r_pio: pinctrl@7022000 {

			compatible = "allwinner,sun50i-h6-r-pinctrl";

			reg = <0x07022000 0x400>;

			interrupt-parent = <&r_intc>;

			interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&r_ccu CLK_R_APB1>, <&osc24M>, <&rtc 0>;