diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2026-05-29 01:28:53 +0200 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2026-05-29 01:28:53 +0200 |
| commit | d4d7cb8539f9104e8d0e2c45289ba539fcd800bf (patch) | |
| tree | 89bc8a4ba902441ab8a17df5e35ca18758f54a8c | |
| parent | d0a0166dbce3126280bbb3f6abaf8cd0e434b26a (diff) | |
| parent | d8d7e7549312c50fa5dcd69a6dc6f0035e770c09 (diff) | |
| download | linux-next-history-d4d7cb8539f9104e8d0e2c45289ba539fcd800bf.tar.gz | |
Merge branch 'v7.2-armsoc/dts64' into for-next
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk356x-base.dtsi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi b/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi index 64bdd8b7754b5..a5832895bd392 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi @@ -195,7 +195,8 @@ interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>, <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>, <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>, - <GIC_PPI 10 IRQ_TYPE_LEVEL_HIGH>; + <GIC_PPI 10 IRQ_TYPE_LEVEL_HIGH>, + <GIC_PPI 12 IRQ_TYPE_LEVEL_HIGH>; arm,no-tick-in-suspend; }; |