From 8017976f372e66b928205c2a505d3b42d799025f Mon Sep 17 00:00:00 2001 From: amazingfate Date: Wed, 25 Dec 2024 10:27:41 +0800 Subject: [PATCH] rockchip64-6.13: remove deprecated display_subsystem node on rk3588 This node is introduced by old version of hdmi pll clock patches, which is already dropped. And in new version of patch hdmi pll clock is added to rk3588-base.dtsi instead of board level devicetree: https://patchwork.kernel.org/project/linux-rockchip/patch/20241211-vop2-hdmi0-disp-modes-v2-5-471cf5001e45@collabora.com/ --- .../archive/rockchip64-6.13/dt/rk3588-cyber-aib.dts | 7 +------ .../rockchip64-6.13/dt/rk3588-rock-5b-plus.dts | 5 ----- .../rockchip64-6.13/dt/rk3588s-youyeetoo-r1.dts | 5 ----- ...s-rockchip-Add-HDMI-support-to-ArmSoM-Sige7.patch | 12 +----------- 4 files changed, 2 insertions(+), 27 deletions(-) diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3588-cyber-aib.dts b/patch/kernel/archive/rockchip64-6.13/dt/rk3588-cyber-aib.dts index aedaf6ee20..d2d5b60e88 100644 --- a/patch/kernel/archive/rockchip64-6.13/dt/rk3588-cyber-aib.dts +++ b/patch/kernel/archive/rockchip64-6.13/dt/rk3588-cyber-aib.dts @@ -291,11 +291,6 @@ status = "okay"; }; -&display_subsystem { - clocks = <&hdptxphy_hdmi0>; - clock-names = "hdmi0_phy_pll"; -}; - &hdmi0 { status = "okay"; }; @@ -1101,4 +1096,4 @@ reg = ; remote-endpoint = <&hdmi0_in_vp0>; }; -}; \ No newline at end of file +}; diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3588-rock-5b-plus.dts b/patch/kernel/archive/rockchip64-6.13/dt/rk3588-rock-5b-plus.dts index a972ec88b9..67ede3557c 100644 --- a/patch/kernel/archive/rockchip64-6.13/dt/rk3588-rock-5b-plus.dts +++ b/patch/kernel/archive/rockchip64-6.13/dt/rk3588-rock-5b-plus.dts @@ -206,11 +206,6 @@ status = "okay"; }; -&display_subsystem { - clocks = <&hdptxphy_hdmi0>; - clock-names = "hdmi0_phy_pll"; -}; - &hdmi0 { status = "okay"; }; diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3588s-youyeetoo-r1.dts b/patch/kernel/archive/rockchip64-6.13/dt/rk3588s-youyeetoo-r1.dts index 08ffb7ad57..1446aa021c 100644 --- a/patch/kernel/archive/rockchip64-6.13/dt/rk3588s-youyeetoo-r1.dts +++ b/patch/kernel/archive/rockchip64-6.13/dt/rk3588s-youyeetoo-r1.dts @@ -226,11 +226,6 @@ mem-supply = <&vdd_cpu_lit_mem_s0>; }; -&display_subsystem { - clocks = <&hdptxphy_hdmi0>; - clock-names = "hdmi0_phy_pll"; -}; - &gpu { mali-supply = <&vdd_gpu_s0>; status = "okay"; diff --git a/patch/kernel/archive/rockchip64-6.13/rk3588-1031-arm64-dts-rockchip-Add-HDMI-support-to-ArmSoM-Sige7.patch b/patch/kernel/archive/rockchip64-6.13/rk3588-1031-arm64-dts-rockchip-Add-HDMI-support-to-ArmSoM-Sige7.patch index 2d8b7a88b8..37ab41a3e3 100644 --- a/patch/kernel/archive/rockchip64-6.13/rk3588-1031-arm64-dts-rockchip-Add-HDMI-support-to-ArmSoM-Sige7.patch +++ b/patch/kernel/archive/rockchip64-6.13/rk3588-1031-arm64-dts-rockchip-Add-HDMI-support-to-ArmSoM-Sige7.patch @@ -19,17 +19,7 @@ index 111111111111..222222222222 100644 #include "rk3588.dtsi" / { -@@ -159,11 +160,30 @@ &cpu_l3 { - cpu-supply = <&vdd_cpu_lit_s0>; - }; - -+&display_subsystem { -+ clocks = <&hdptxphy_hdmi0>; -+ clock-names = "hdmi0_phy_pll"; -+}; -+ - &gpu { - mali-supply = <&vdd_gpu_s0>; +@@ -159,6 +160,20 @@ &cpu_l3 { status = "okay"; };