From aaaf8fe9de48836cbc46de2d8a7e9a1abfb2466e Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Tue, 4 Feb 2025 22:22:49 +0800 Subject: [PATCH] arm64: dts: rockchip: enable av1d/avsd/vdpu/vdpu_mmu/vepu for rk3588 Signed-off-by: nyanmisaka --- .../boot/dts/rockchip/rk3588-armsom-aim7.dtsi | 6 +++++- .../arm64/boot/dts/rockchip/rk3588-armsom-w3.dts | 8 ++++++++ .../dts/rockchip/rk3588-blade3-v101-linux.dts | 8 ++++++++ .../arm64/boot/dts/rockchip/rk3588-cyber-aib.dts | 4 ++++ .../dts/rockchip/rk3588-firefly-itx-3588j.dts | 10 +++++++++- .../boot/dts/rockchip/rk3588-fxblox-rk1.dts | 4 ++++ .../boot/dts/rockchip/rk3588-hinlink-h88k.dts | 8 ++++++++ .../dts/rockchip/rk3588-mixtile-core3588e.dts | 8 ++++++++ .../boot/dts/rockchip/rk3588-orangepi-5-max.dts | 8 ++++++++ .../boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 4 ++++ .../boot/dts/rockchip/rk3588-radxa-rock-5b+.dts | 6 +++++- .../boot/dts/rockchip/rk3588-rock-5-itx.dts | 6 +++++- arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 4 ++++ .../boot/dts/rockchip/rk3588-turing-rk1.dtsi | 4 ++++ .../boot/dts/rockchip/rk3588s-khadas-edge2.dts | 4 ++++ .../boot/dts/rockchip/rk3588s-lubancat-4.dts | 4 ++++ .../dts/rockchip/rk3588s-nanopi-r6-common.dtsi | 4 ++++ .../boot/dts/rockchip/rk3588s-orangepi-5-pro.dts | 4 ++++ .../boot/dts/rockchip/rk3588s-orangepi-5.dts | 6 +++++- .../boot/dts/rockchip/rk3588s-radxa-cm5.dtsi | 16 ++++++++++++++++ .../boot/dts/rockchip/rk3588s-radxa-e52c.dts | 8 ++++++++ .../dts/rockchip/rk3588s-radxa-nx5-module.dtsi | 16 ++++++++++++++++ arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts | 8 ++++++++ arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 4 ++++ arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 4 ++++ .../boot/dts/rockchip/rk3588s-yyt-common.dtsi | 6 +++++- 26 files changed, 166 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-armsom-aim7.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-armsom-aim7.dtsi index a550982fac33..6e16ff7e4ebb 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-armsom-aim7.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-armsom-aim7.dtsi @@ -23,6 +23,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &cpu_l0 { cpu-supply = <&vdd_cpu_lit_s0>; mem-supply = <&vdd_cpu_lit_mem_s0>; @@ -277,4 +281,4 @@ /* watchdog */ &wdt { status = "okay"; -}; \ No newline at end of file +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts b/arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts index 5780284209c8..fe2044785e69 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts @@ -312,6 +312,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &cpu_l0 { cpu-supply = <&vdd_cpu_lit_s0>; mem-supply = <&vdd_cpu_lit_mem_s0>; @@ -476,6 +480,10 @@ status = "okay"; }; +&vepu { + status = "okay"; +}; + &mpp_srv { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-blade3-v101-linux.dts b/arch/arm64/boot/dts/rockchip/rk3588-blade3-v101-linux.dts index e90aad5665c0..d02826cea4e7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-blade3-v101-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-blade3-v101-linux.dts @@ -246,6 +246,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &cpu_l0 { cpu-supply = <&vdd_cpu_lit_s0>; mem-supply = <&vdd_cpu_lit_mem_s0>; @@ -616,6 +620,10 @@ status = "okay"; }; +&vepu { + status = "okay"; +}; + &vop { assigned-clocks = <&cru ACLK_VOP>; assigned-clock-rates = <800000000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-cyber-aib.dts b/arch/arm64/boot/dts/rockchip/rk3588-cyber-aib.dts index f7e9c1db9299..424f119b1f3f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-cyber-aib.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-cyber-aib.dts @@ -258,6 +258,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &cpu_l0 { cpu-supply = <&vdd_cpu_lit_s0>; mem-supply = <&vdd_cpu_lit_mem_s0>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-firefly-itx-3588j.dts b/arch/arm64/boot/dts/rockchip/rk3588-firefly-itx-3588j.dts index 2323b96571d0..6449e6d8a416 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-firefly-itx-3588j.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-firefly-itx-3588j.dts @@ -410,6 +410,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &can1 { status = "okay"; assigned-clocks = <&cru CLK_CAN1>; @@ -1369,6 +1373,10 @@ status = "okay"; }; +&vepu { + status = "okay"; +}; + &vop { status = "okay"; }; @@ -1413,4 +1421,4 @@ regulator-on-in-suspend; regulator-suspend-microvolt = <1800000>; }; -}; \ No newline at end of file +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-fxblox-rk1.dts b/arch/arm64/boot/dts/rockchip/rk3588-fxblox-rk1.dts index 7b09635a0853..08fe65cd61ae 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-fxblox-rk1.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-fxblox-rk1.dts @@ -269,6 +269,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &cpu_l0 { cpu-supply = <&vdd_cpu_lit_s0>; mem-supply = <&vdd_cpu_lit_mem_s0>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-hinlink-h88k.dts b/arch/arm64/boot/dts/rockchip/rk3588-hinlink-h88k.dts index 6e69f2b772d1..c3437a0f388e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-hinlink-h88k.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-hinlink-h88k.dts @@ -336,6 +336,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &combphy0_ps { status = "okay"; }; @@ -1072,6 +1076,10 @@ status = "okay"; }; +&vepu { + status = "okay"; +}; + &vop { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-mixtile-core3588e.dts b/arch/arm64/boot/dts/rockchip/rk3588-mixtile-core3588e.dts index e5e2d21e70bc..ea6dc637d6e4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-mixtile-core3588e.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-mixtile-core3588e.dts @@ -239,6 +239,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &cpu_l0 { cpu-supply = <&vdd_cpu_lit_s0>; mem-supply = <&vdd_cpu_lit_mem_s0>; @@ -526,6 +530,10 @@ status = "okay"; }; +&vepu { + status = "okay"; +}; + &vop { assigned-clocks = <&cru ACLK_VOP>; assigned-clock-rates = <800000000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-max.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-max.dts index c857ce008674..7531a2c74ee7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-max.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-max.dts @@ -431,10 +431,18 @@ }; }; +&av1d { + status = "okay"; +}; + &av1d_mmu { status = "okay"; }; +&avsd { + status = "okay"; +}; + &dsi0 { status = "disabled"; //rockchip,lane-rate = <1000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts index 146d5f873cc5..83ed754c9d27 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts @@ -377,6 +377,10 @@ &av1d_mmu { status = "okay"; }; + +&avsd { + status = "okay"; +}; &can0 { status = "disabled"; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-radxa-rock-5b+.dts b/arch/arm64/boot/dts/rockchip/rk3588-radxa-rock-5b+.dts index 4de7c160d2df..c3239374f0bc 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-radxa-rock-5b+.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-radxa-rock-5b+.dts @@ -256,6 +256,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &cpu_l0 { cpu-supply = <&vdd_cpu_lit_s0>; mem-supply = <&vdd_cpu_lit_mem_s0>; @@ -1280,4 +1284,4 @@ "", "", "", "", /* GPIO4_D4-D7 */ "", "", "", ""; -}; \ No newline at end of file +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts index 1bf298e63938..36da450205ff 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts @@ -308,6 +308,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &cpu_l0 { cpu-supply = <&vdd_cpu_lit_s0>; mem-supply = <&vdd_cpu_lit_mem_s0>; @@ -1237,4 +1241,4 @@ rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>; }; }; -}; \ No newline at end of file +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts index b776fd9666b2..fc560fd8f907 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -244,6 +244,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &cpu_l0 { cpu-supply = <&vdd_cpu_lit_s0>; mem-supply = <&vdd_cpu_lit_mem_s0>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi index 63760508b8e2..f7711b73567e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi @@ -209,6 +209,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &cpu_l0 { cpu-supply = <&vdd_cpu_lit_s0>; mem-supply = <&vdd_cpu_lit_mem_s0>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts index 949026d0a534..5a6cbd3396e8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts @@ -308,6 +308,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &combphy0_ps { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-lubancat-4.dts b/arch/arm64/boot/dts/rockchip/rk3588s-lubancat-4.dts index 18a4f00682fd..1f4e17d3a851 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-lubancat-4.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-lubancat-4.dts @@ -393,6 +393,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &spdif_tx2 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6-common.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6-common.dtsi index 43617e9339c7..4703316c0f52 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6-common.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6-common.dtsi @@ -685,6 +685,10 @@ status = "okay"; }; +&vepu { + status = "okay"; +}; + &vop { assigned-clocks = <&cru ACLK_VOP>; assigned-clock-rates = <800000000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-pro.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-pro.dts index 9c14c4a6db3e..8f4afdb5fda8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-pro.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-pro.dts @@ -294,6 +294,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &gpu { mali-supply = <&vdd_gpu_s0>; mem-supply = <&vdd_gpu_mem_s0>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts index fe6e843f4cea..1838e6580f29 100755 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts @@ -281,6 +281,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &can1 { status = "disabled"; pinctrl-names = "default"; @@ -1162,4 +1166,4 @@ cursor-win-id=; rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER3 | 1 << ROCKCHIP_VOP2_ESMART3)>; rockchip,primary-plane = ; -}; \ No newline at end of file +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi index fdb2d754c76e..f8fc2ced2fa2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi @@ -118,6 +118,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &cpu_l0 { cpu-supply = <&vdd_cpu_lit_s0>; mem-supply = <&vdd_cpu_lit_mem_s0>; @@ -384,3 +388,15 @@ regulator-min-microvolt = <837500>; regulator-max-microvolt = <837500>; }; + +&vdpu { + status = "okay"; +}; + +&vdpu_mmu { + status = "okay"; +}; + +&vepu { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-e52c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-e52c.dts index 332dc5a85f94..0b3f9f1c6cd5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-e52c.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-e52c.dts @@ -341,6 +341,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &saradc { status = "okay"; vref-supply = <&avcc_1v8_s0>; @@ -419,6 +423,10 @@ status = "okay"; }; +&vepu { + status = "okay"; +}; + /* Video Ports */ &vop { diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-nx5-module.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-nx5-module.dtsi index 66f894a5e0a1..08e84e305cf0 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-nx5-module.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-nx5-module.dtsi @@ -141,6 +141,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &cpu_l0 { cpu-supply = <&vdd_cpu_lit_s0>; mem-supply = <&vdd_cpu_lit_mem_s0>; @@ -417,6 +421,18 @@ }; }; +&vdpu { + status = "okay"; +}; + +&vdpu_mmu { + status = "okay"; +}; + +&vepu { + status = "okay"; +}; + &pinctrl { hym8563 { diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts index 8c542a209623..586d131ca90b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts @@ -297,6 +297,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + /* default use sata3.0 , pcie2.0 optional*/ &combphy0_ps { status = "okay"; @@ -975,6 +979,10 @@ status = "okay"; }; +&vepu { + status = "okay"; +}; + &vop { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts index 2d5c6327701a..bf573e763381 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts @@ -177,6 +177,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &i2c0 { status = "okay"; pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts index 9f72ecd2d464..54e4299bf838 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts @@ -229,6 +229,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + /* CPU */ &cpu_l0 { diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-yyt-common.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-yyt-common.dtsi index 18f36391f30c..a9c7bee56064 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-yyt-common.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-yyt-common.dtsi @@ -466,6 +466,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &saradc { status = "okay"; vref-supply = <&avcc_1v8_s0>; @@ -950,4 +954,4 @@ rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; }; }; -}; \ No newline at end of file +};