diff --git a/arch/arm64/boot/dts/rockchip/rk3588-blueberry.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-blueberry.dtsi index 6cb89839c0b83..b991223698f50 100644 --- 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 index f1fa6bd526d6c..046ac0ddae7b2 100644 --- 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>; }; -}; \ 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 dcaff704f12f0..170d4abe82c1d 100644 --- 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 index 201400b4c93b9..f416ebb86f569 100644 --- 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 = ; }; -&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 index 1624b28f05294..80ea18a2ca588 100644 --- 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 index 5485e966dd311..62402d62f2be8 100644 --- 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 index 1e2ad1db19df1..bbff1dd684d2e 100644 --- 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 index bfa895c754fc5..9ddc614d1c0ba 100644 --- 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 index a72e146f9246f..a80d0c775e183 100644 --- 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 = ; }; -&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 index c41dd2e066d8d..b7e8cc94366c9 100755 --- 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 index 2005e16d2fce6..f0c750bfb6a7e 100644 --- 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 = ; }; -&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 index 10f8f32bee592..9c3b1c7230673 100644 --- 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 = ; }; -&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 index ab92f7157036e..533f9332b6e49 100644 --- 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 index 9c8c2ff45518e..2c6ee6f9e12a1 100644 --- 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 = ; }; -&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 index eb4d124fd0c89..048acb4242e27 100755 --- 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,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-io.dts b/arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts index 2ca1e3293eab2..f64a29a7a0eb5 100644 --- 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 = ; }; -&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 index 69587ce849678..a2ade636e8c6c 100644 --- 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 = ; }; -&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 index e298a21f0d3d3..f16f8621d51f9 100644 --- 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 = ; }; -&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 index 4f4f0b9dcab3a..8e3473f7d4bd6 100644 --- 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 = ; }; -&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 index e79606f31c9b3..b72bf2245963a 100644 --- 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 index 689499f9c822f..2dbfe85b1c67e 100644 --- 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 = ; }; -&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 index 2f879ec5939d6..3dfb52208bc8e 100644 --- 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 = ; }; -&display_subsystem { - clocks = <&hdptxphy_hdmi_clk0>; - clock-names = "hdmi0_phy_pll"; -}; - -&hdptxphy_hdmi_clk0 { - status = "okay"; -}; - /* USB */ &usb_host0_ehci {