arm64: dts: rockchip: rk3588: remove unused hdptxphy_hdmi_clk0/1 in b…

…oard devicetree hdptxphy_hdmi_clk0/1 sub node is removed by commit fa7c72a: arm64: dts: rockchip: rk3588: remove unused sub node hdptxphy_hdmi_clk0/1. So remove them from all the board dts.
efectn-forks · Jul 18, 2024 · 672dacb · 672dacb
1 parent 4494680
commit 672dacb
Show file tree

Hide file tree

Showing 22 changed files with 2 additions and 198 deletions.
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-blueberry.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-blueberry.dtsi
@@ -132,11 +132,6 @@
 	mem-supply = <&vdd_cpu_big1_mem_s0>;
 };
 
-&display_subsystem {
-	clocks = <&hdptxphy_hdmi_clk0>, <&hdptxphy_hdmi_clk1>;
-	clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";
-};
-
 &gpu_opp_table {
 	/delete-node/ opp-198000000;
 	/delete-node/ opp-297000000;
@@ -152,14 +147,6 @@
 	status = "okay";
 };
 
-&hdptxphy_hdmi_clk0 {
-	status = "okay";
-};
-
-&hdptxphy_hdmi_clk1 {
-	status = "okay";
-};
-
 &iep {
 	status = "okay";
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-firefly-itx-3588j.dts b/arch/arm64/boot/dts/rockchip/rk3588-firefly-itx-3588j.dts
@@ -446,11 +446,6 @@
 	mem-supply = <&vdd_cpu_big1_mem_s0>;
 };
 
-&display_subsystem {
-	clocks = <&hdptxphy_hdmi_clk0>, <&hdptxphy_hdmi_clk1>;
-	clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";
-};
-
 &dp0 {
 	status = "okay";
 };
@@ -603,14 +598,6 @@
 	status = "okay";
 };
 
-&hdptxphy_hdmi_clk0 {
-	status = "okay";
-};
-
-&hdptxphy_hdmi_clk1 {
-	status = "okay";
-};
-
 &route_hdmi1{
 	status = "okay";
 	connect = <&vp1_out_hdmi1>;
@@ -1413,4 +1400,4 @@
 		regulator-on-in-suspend;
 		regulator-suspend-microvolt = <1800000>;
 	};
-};
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-fxblox-rk1.dts b/arch/arm64/boot/dts/rockchip/rk3588-fxblox-rk1.dts
@@ -640,8 +640,6 @@
 };
 
 &display_subsystem {
-	clocks = <&hdptxphy_hdmi_clk0>, <&hdptxphy_hdmi_clk1>;
-	clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";
 	route {
 			route_dp0: route-dp0 {
 				status = "ok";

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-mixtile-core3588e.dts b/arch/arm64/boot/dts/rockchip/rk3588-mixtile-core3588e.dts
@@ -561,19 +561,6 @@
 	cursor-win-id = <ROCKCHIP_VOP2_ESMART3>;
 };
 
-&display_subsystem {
-	clocks = <&hdptxphy_hdmi_clk0>;
-	clock-names = "hdmi0_phy_pll";
-};
-
-&hdptxphy_hdmi0 {
-	status = "okay";
-};
-
-&hdptxphy_hdmi_clk0 {
-	status = "okay";
-};
-
 &combphy0_ps {
 	status = "okay";
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
@@ -708,10 +708,3 @@
 	/delete-property/ enable-active-high;
 	gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_LOW>;
 };
-
-
-&display_subsystem {
-	clocks = <&hdptxphy_hdmi_clk0>, <&hdptxphy_hdmi_clk1>;
-	clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";
-};
-
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
@@ -425,11 +425,6 @@
     status = "okay";
 };
 
-&display_subsystem {
-    clocks = <&hdptxphy_hdmi_clk0>, <&hdptxphy_hdmi_clk1>;
-    clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";
-};
-
 &dp0 {
     status = "okay";
 };
@@ -485,14 +480,6 @@
     status = "okay";
 };
 
-&hdptxphy_hdmi_clk0 {
-	status = "okay";
-};
-
-&hdptxphy_hdmi_clk1 {
-	status = "okay";
-};
-
 &iep {
     status = "okay";
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
@@ -587,19 +587,6 @@
 	status = "okay";
 };
 
-&display_subsystem {
-	clocks = <&hdptxphy_hdmi_clk0>, <&hdptxphy_hdmi_clk1>;
-	clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";
-};
-
-&hdptxphy_hdmi_clk0 {
-	status = "okay";
-};
-
-&hdptxphy_hdmi_clk1 {
-	status = "okay";
-};
-
 &hdmi1 {
 	status = "okay";
 	pinctrl-names = "default";

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -633,9 +633,6 @@
 };
 
 &display_subsystem {
-	clocks = <&hdptxphy_hdmi_clk0>, <&hdptxphy_hdmi_clk1>;
-	clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";
-
 	route {
 		route_hdmi0: route-hdmi0 {
 			status = "okay";
@@ -657,14 +654,6 @@
 	};
 };
 
-&hdptxphy_hdmi_clk0 {
-	status = "okay";
-};
-
-&hdptxphy_hdmi_clk1 {
-	status = "okay";
-};
-
 &hdmi0 {
 	status = "okay";
         cec-enable = "true";

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi
@@ -664,15 +664,6 @@
 	cursor-win-id = <ROCKCHIP_VOP2_ESMART3>;
 };
 
-&display_subsystem {
-	clocks = <&hdptxphy_hdmi_clk0>;
-	clock-names = "hdmi0_phy_pll";
-};
-
-&hdptxphy_hdmi_clk0 {
-	status = "okay";
-};
-
 &uart9 {
 	pinctrl-0 = <&uart9m0_xfer>;
 	status = "okay";

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-9tripod-linux.dts b/arch/arm64/boot/dts/rockchip/rk3588s-9tripod-linux.dts
@@ -361,11 +361,6 @@
 	status = "okay";
 };
 
-&display_subsystem {
-    clocks = <&hdptxphy_hdmi_clk0>;
-    clock-names = "hdmi0_phy_pll";
-};
-
 &dmc {
 	center-supply = <&vdd_ddr_s0>;
 	mem-supply = <&vdd_log_s0>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
@@ -994,15 +994,6 @@
 	cursor-win-id = <ROCKCHIP_VOP2_ESMART3>;
 };
 
-&display_subsystem {
-	clocks = <&hdptxphy_hdmi_clk0>;
-	clock-names = "hdmi0_phy_pll";
-};
-
-&hdptxphy_hdmi_clk0 {
-	status = "okay";
-};
-
 &tsadc {
 	status = "okay";
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-lubancat-4.dts b/arch/arm64/boot/dts/rockchip/rk3588s-lubancat-4.dts
@@ -1502,15 +1502,6 @@
 	cursor-win-id = <ROCKCHIP_VOP2_CLUSTER3>;
 };
 
-&display_subsystem {
-	clocks = <&hdptxphy_hdmi_clk0>;
-	clock-names = "hdmi0_phy_pll";
-};
-
-&hdptxphy_hdmi_clk0 {
-    status = "okay";
-};
-
 &pinctrl {
     hym8563 {
         hym8563_int: hym8563-int {

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6-common.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6-common.dtsi
@@ -703,8 +703,3 @@
 &wdt {
 	status = "okay";
 };
-
-&display_subsystem {
-	clocks = <&hdptxphy_hdmi_clk0>;
-	clock-names = "hdmi0_phy_pll";
-};
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-pro.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-pro.dts
@@ -534,11 +534,6 @@
 	rockchip,primary-plane = <ROCKCHIP_VOP2_CLUSTER3>;
 };
 
-&display_subsystem {
-	clocks = <&hdptxphy_hdmi_clk0>;
-	clock-names = "hdmi0_phy_pll";
-};
-
 &cpu_l0 {
 	cpu-supply = <&vdd_cpu_lit_s0>;
 	mem-supply = <&vdd_cpu_lit_mem_s0>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
@@ -324,12 +324,6 @@
 	status = "okay";
 };
 
-/* Fix tty terminal out of screen, and most dclk of resolutions was not supported in hdmiphy clock from parent clock by default */
-&display_subsystem {
-	clocks = <&hdptxphy_hdmi_clk0>;
-	clock-names = "hdmi0_phy_pll";
-};
-
 &dp0 {
 	status = "okay";
 };
@@ -1162,4 +1156,4 @@
 	cursor-win-id=<ROCKCHIP_VOP2_ESMART3>;
 	rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER3 | 1 << ROCKCHIP_VOP2_ESMART3)>;
 	rockchip,primary-plane = <ROCKCHIP_VOP2_CLUSTER3>;
-};
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts
@@ -388,15 +388,6 @@
 	cursor-win-id = <ROCKCHIP_VOP2_ESMART3>;
 };
 
-&display_subsystem {
-	clocks = <&hdptxphy_hdmi_clk0>;
-	clock-names = "hdmi0_phy_pll";
-};
-
-&hdptxphy_hdmi_clk0 {
-	status = "okay";
-};
-
 &pinctrl {
 
 	usb {

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-rpi-cm4-io.dts b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-rpi-cm4-io.dts
@@ -158,15 +158,6 @@
 	cursor-win-id = <ROCKCHIP_VOP2_ESMART3>;
 };
 
-&display_subsystem {
-	clocks = <&hdptxphy_hdmi_clk0>;
-	clock-names = "hdmi0_phy_pll";
-};
-
-&hdptxphy_hdmi_clk0 {
-	status = "okay";
-};
-
 &i2c7 {
 	status = "okay";
 	pinctrl-names = "default";

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-e52c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-e52c.dts
@@ -458,15 +458,6 @@
 	cursor-win-id = <ROCKCHIP_VOP2_ESMART3>;
 };
 
-&display_subsystem {
-	clocks = <&hdptxphy_hdmi_clk0>;
-	clock-names = "hdmi0_phy_pll";
-};
-
-&hdptxphy_hdmi_clk0 {
-	status = "okay";
-};
-
 /* USB */
 
 &u2phy0 {

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-radxa-nx5-io.dts b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-nx5-io.dts
@@ -291,15 +291,6 @@
 	cursor-win-id = <ROCKCHIP_VOP2_ESMART3>;
 };
 
-&display_subsystem {
-	clocks = <&hdptxphy_hdmi_clk0>;
-	clock-names = "hdmi0_phy_pll";
-};
-
-&hdptxphy_hdmi_clk0 {
-	status = "okay";
-};
-
 &sdmmc {
 	no-sdio;
 	no-mmc;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts
@@ -322,11 +322,6 @@
 	mem-supply = <&vdd_cpu_big1_mem_s0>;
 };
 
-&display_subsystem {
-       clocks = <&hdptxphy_hdmi_clk0>;
-       clock-names = "hdmi0_phy_pll";
-};
-
 &dp0 {
 	status = "okay";
 };
@@ -383,10 +378,6 @@
 	status = "okay";
 };
 
-&hdptxphy_hdmi_clk0 {
-       status = "okay";
-};
-
 &i2c0 {
 	status = "okay";
 	pinctrl-0 = <&i2c0m2_xfer>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
@@ -541,15 +541,6 @@
 	cursor-win-id = <ROCKCHIP_VOP2_ESMART3>;
 };
 
-&display_subsystem {
-	clocks = <&hdptxphy_hdmi_clk0>;
-	clock-names = "hdmi0_phy_pll";
-};
-
-&hdptxphy_hdmi_clk0 {
-	status = "okay";
-};
-
 /* USB */
 
 &usb_host0_ehci {

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts
@@ -504,15 +504,6 @@
 	rockchip,primary-plane = <ROCKCHIP_VOP2_ESMART3>;
 };
 
-&display_subsystem {
-	clocks = <&hdptxphy_hdmi_clk0>;
-	clock-names = "hdmi0_phy_pll";
-};
-
-&hdptxphy_hdmi_clk0 {
-	status = "okay";
-};
-
 /* USB */
 
 &usb_host0_ehci {