arm64: dts: rockchip: Fix label name of hdptxphy for RK3588

The hdptxphy is a combo transmit-PHY for HDMI2.1 TMDS Link, FRL Link, DP
and eDP Link. Therefore, it is better to name it hdptxphy0 other than
hdptxphy_hdmi0, which will be referenced by both hdmi0 and edp0 nodes.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Link: https://lore.kernel.org/r/20250206030330.680424-3-damon.ding@rock-chips.com
[added armsom-sige7, where hdmi-support was added recently and also
 the hdptxphy0-as-dclk source I just added]
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts b/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
index b3e9ffe5234748d541988d152517e310b103f4e4..b89888fe5d464cae642f34f97da70e9ae111188a 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
@@ -192,7 +192,7 @@
        };
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
index c53cd90d411239a9b1b26d45b2d56cbac0647fc0..a81a193fa1368144acfd6481f7ee7247708b16d6 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
@@ -1262,7 +1262,7 @@
                         <&cru DCLK_VOP2>,
                         <&cru DCLK_VOP3>,
                         <&cru PCLK_VOP_ROOT>,
-                        <&hdptxphy_hdmi0>;
+                        <&hdptxphy0>;
                clock-names = "aclk",
                              "hclk",
                              "dclk_vp0",
@@ -1387,7 +1387,7 @@
                             <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH 0>,
                             <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH 0>;
                interrupt-names = "avp", "cec", "earc", "main", "hpd";
-               phys = <&hdptxphy_hdmi0>;
+               phys = <&hdptxphy0>;
                pinctrl-names = "default";
                pinctrl-0 = <&hdmim0_tx0_cec &hdmim0_tx0_hpd
                             &hdmim0_tx0_scl &hdmim0_tx0_sda>;
@@ -2812,7 +2812,7 @@
                #dma-cells = <1>;
        };
 
-       hdptxphy_hdmi0: phy@fed60000 {
+       hdptxphy0: phy@fed60000 {
                compatible = "rockchip,rk3588-hdptx-phy";
                reg = <0x0 0xfed60000 0x0 0x2000>;
                clocks = <&cru CLK_USB2PHY_HDPTXRXPHY_REF>, <&cru PCLK_HDPTX0>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
index 9d525c8ff725b91fd13c120bf1e698951c9194e2..9eda69722665fdf67b60adc253be41ee8a820c44 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
@@ -129,7 +129,7 @@
        };
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts
index 92f0ed83c990228e91997eaaf0d354b493fc51df..d1be72eb63a4e6ef5ca2779398f06f5568bbbdf8 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts
@@ -166,7 +166,7 @@
        };
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
index ba49f0bbaac62356cbd537d3178be094a311ae66..3fd0665cde2ca15cd309919ff751b00e0f53a400 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
@@ -364,7 +364,7 @@
        };
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
        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 2be5251d3e3be640bd96caebaea5e0e2cfd9abc2..e086114c7634874eb1eed6bd03bd6d0b587a269c 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-firefly-itx-3588j.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-firefly-itx-3588j.dts
@@ -337,7 +337,7 @@
        };
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts
index b3a04ca370bb925b3caba40cdfc14cc2bd3e4229..8171fbfd819a7b087752080e7e8dd4d8bade6533 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts
@@ -335,7 +335,7 @@
        };
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts b/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts
index 4791b77f3571db3a888c015596b4cc1863fdc3f7..c8bc85b7d1339c4b457e36968a276fe0fa1900da 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts
@@ -207,7 +207,7 @@
        };
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts b/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts
index 90f823b2c2191dac008d93c51b0680a6aeb31d72..ef56380530f9ab756de961e2f7785e0277b45725 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts
@@ -303,7 +303,7 @@
        };
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
index cb350727d11680b6d5f67b9a0d66d346993a4023..0d9b5020acc099f84f89ef47a43d7a6cbb867719 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -360,7 +360,7 @@
        };
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
        status = "okay";
 };
 

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 ce44549babf48ab7e259a070b66a376e887dde99..9baca7f9ce4830fbba0cdc5f9be6026c6bf11500 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-max.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-max.dts
@@ -39,7 +39,7 @@
        };
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
        status = "okay";
 };
 

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 255e33c5dbdc0806c98e4652d95bd64ad57a6eb0..0f874b87b47e4c0201a3fe5a182f3869d07fbebd 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
@@ -125,7 +125,7 @@
        };
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index d597112f1d5b8ee0b6a4fa17086c8671a5102583..86a9f2f35e66756e09576da4c96c1401ae7ee4c1 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -220,7 +220,7 @@
        };
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts
index 3187b4918a300dae49fe05d760fb7e1fd55f14d5..795d8175e654278c641f782bc6b149b448b57783 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts
@@ -189,7 +189,7 @@
        };
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
index 9c394f733bbfbba5a547bebcdcaa4f0794539647..f471baca6d3101ce7e850b666589587dc70d8a17 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
@@ -236,7 +236,7 @@
        };
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
index 4a3aa80f2226fd8eaed69ffd68c1d3d0a0a49178..74a4f03e05e35138232f5393b75c6853fa05d7af 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
@@ -278,7 +278,7 @@
        };
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
index d2eddea1840f4fd489e06072b99a97804c48294b..cd47969fadba051a22fdb8118a232c1c124c00b2 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
@@ -251,7 +251,7 @@
        };
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
index 8f034c6d494c4a5c79857948e3fc52ac7ce08a8e..1463bd36b1b2e37dfa0da953b3837b33e4e9bf7e 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
@@ -264,7 +264,7 @@
        };
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi
index d86aeacca238d917782c30e618d9db5e327b970c..9e16960b87055a120b6208e75c7ec4189c0e0b4a 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi
@@ -197,7 +197,7 @@
        };
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
        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 70a43432bdc57df21dadf22e2936aa92a0d33d1a..676cc4fec269ef8955630680791231deb8a775cb 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
@@ -334,7 +334,7 @@
        };
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts
index 6e56d7704cbe0dc06242cb39df56b2fc9d6bc774..9dcf774706ca87296ba0750b797cac0785336a74 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts
@@ -278,7 +278,7 @@
        };
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
        status = "okay";
 };