UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: 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:
Samuel Holland 2021-01-17 23:50:40 -06:00 committed by Chen-Yu Tsai
parent 73088dfee6
commit 189bef235d
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
View File

@ -648,6 +648,7 @@
pio: pinctrl@1c20800 { pio: pinctrl@1c20800 {
compatible = "allwinner,sun50i-a64-pinctrl"; compatible = "allwinner,sun50i-a64-pinctrl";
reg = <0x01c20800 0x400>; reg = <0x01c20800 0x400>;
interrupt-parent = <&r_intc>;
interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
@ -818,6 +819,7 @@
compatible = "allwinner,sun50i-a64-lradc", compatible = "allwinner,sun50i-a64-lradc",
"allwinner,sun8i-a83t-r-lradc"; "allwinner,sun8i-a83t-r-lradc";
reg = <0x01c21800 0x400>; reg = <0x01c21800 0x400>;
interrupt-parent = <&r_intc>;
interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled"; status = "disabled";
}; };
@ -1208,6 +1210,7 @@
compatible = "allwinner,sun50i-a64-rtc", compatible = "allwinner,sun50i-a64-rtc",
"allwinner,sun8i-h3-rtc"; "allwinner,sun8i-h3-rtc";
reg = <0x01f00000 0x400>; reg = <0x01f00000 0x400>;
interrupt-parent = <&r_intc>;
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
clock-output-names = "osc32k", "osc32k-out", "iosc"; clock-output-names = "osc32k", "osc32k-out", "iosc";
@ -1279,6 +1282,7 @@
r_pio: pinctrl@1f02c00 { r_pio: pinctrl@1f02c00 {
compatible = "allwinner,sun50i-a64-r-pinctrl"; compatible = "allwinner,sun50i-a64-r-pinctrl";
reg = <0x01f02c00 0x400>; reg = <0x01f02c00 0x400>;
interrupt-parent = <&r_intc>;
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&r_ccu CLK_APB0_PIO>, <&osc24M>, <&osc32k>; clocks = <&r_ccu CLK_APB0_PIO>, <&osc24M>, <&osc32k>;
clock-names = "apb", "hosc", "losc"; clock-names = "apb", "hosc", "losc";

3
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
View File

@ -294,6 +294,7 @@
pio: pinctrl@300b000 { pio: pinctrl@300b000 {
compatible = "allwinner,sun50i-h6-pinctrl"; compatible = "allwinner,sun50i-h6-pinctrl";
reg = <0x0300b000 0x400>; reg = <0x0300b000 0x400>;
interrupt-parent = <&r_intc>;
interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
@ -902,6 +903,7 @@
rtc: rtc@7000000 { rtc: rtc@7000000 {
compatible = "allwinner,sun50i-h6-rtc"; compatible = "allwinner,sun50i-h6-rtc";
reg = <0x07000000 0x400>; reg = <0x07000000 0x400>;
interrupt-parent = <&r_intc>;
interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
clock-output-names = "osc32k", "osc32k-out", "iosc"; clock-output-names = "osc32k", "osc32k-out", "iosc";
@ -937,6 +939,7 @@
r_pio: pinctrl@7022000 { r_pio: pinctrl@7022000 {
compatible = "allwinner,sun50i-h6-r-pinctrl"; compatible = "allwinner,sun50i-h6-r-pinctrl";
reg = <0x07022000 0x400>; reg = <0x07022000 0x400>;
interrupt-parent = <&r_intc>;
interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&r_ccu CLK_R_APB1>, <&osc24M>, <&rtc 0>; clocks = <&r_ccu CLK_R_APB1>, <&osc24M>, <&rtc 0>;