rockchip64-edge: add hdmi1 disp modes support to rk3588

patch/kernel/archive/rockchip64-6.14/dt/rk3588-cyber-aib.dts

@@ -301,7 +301,7 @@
 	};
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
 	status = "okay";
 };
 

patch/kernel/archive/rockchip64-6.14/dt/rk3588-hinlink-h88k.dts

@@ -270,7 +270,7 @@
 };
 
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
 	status = "okay";
 };
 

patch/kernel/archive/rockchip64-6.14/dt/rk3588-rock-5b-plus.dts

@@ -216,7 +216,7 @@
 	};
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
 	status = "okay";
 };
 

patch/kernel/archive/rockchip64-6.14/dt/rk3588s-nanopi-m6.dts

@@ -282,7 +282,7 @@
 	};
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
 	status = "okay";
 };
 

patch/kernel/archive/rockchip64-6.14/dt/rk3588s-youyeetoo-r1.dts

@@ -835,7 +835,7 @@
 	cec-enable = "true";
 };
 
-&hdptxphy_hdmi0 {
+&hdptxphy0 {
 	status = "okay";
 };
 

patch/kernel/archive/rockchip64-6.14/rk3588-0131-vop2-hdmi0-disp-modes-support.patch

@@ -115,7 +115,7 @@ index 111111111111..222222222222 100644
  	struct vop2_win win[];
  };
 
-+#define VOP2_MAX_DCLK_RATE		600000 /* kHz */
++#define VOP2_MAX_DCLK_RATE		600000000
 +
  #define vop2_output_if_is_hdmi(x)	((x) == ROCKCHIP_VOP2_EP_HDMI0 || \
  					 (x) == ROCKCHIP_VOP2_EP_HDMI1)
@@ -138,7 +138,7 @@ index 111111111111..222222222222 100644
 +	 * Switch to HDMI PHY PLL as DCLK source for display modes up
 +	 * to 4K@60Hz, if available, otherwise keep using the system CRU.
 +	 */
-+	if (vop2->pll_hdmiphy0 && mode->crtc_clock <= VOP2_MAX_DCLK_RATE) {
++	if (vop2->pll_hdmiphy0 && clock <= VOP2_MAX_DCLK_RATE) {
 +		drm_for_each_encoder_mask(encoder, crtc->dev, crtc_state->encoder_mask) {
 +			struct rockchip_encoder *rkencoder = to_rockchip_encoder(encoder);
 +

patch/kernel/archive/rockchip64-6.14/rk3588-0132-Fix-label-name-of-hdptxphy-for-RK3588.patch

@@ -0,0 +1,319 @@
+From 2efdb041019fd6c58abefba3eb6fdc4d659e576c Mon Sep 17 00:00:00 2001
+From: Damon Ding <[email protected]>
+Date: Thu, 6 Feb 2025 11:03:30 +0800
+Subject: 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 <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+[added armsom-sige7, where hdmi-support was added recently and also
+ the hdptxphy0-as-dclk source I just added]
+Signed-off-by: Heiko Stuebner <[email protected]>
+---
+ arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts            | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588-base.dtsi                   | 6 +++---
+ arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts          | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts      | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts                | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588-firefly-itx-3588j.dts       | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts             | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts                  | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi              | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-max.dts          | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts         | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts                 | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts            | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts              | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts        | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi             | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts              | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi            | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts                | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts                | 2 +-
+ 21 files changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
+index c53cd90d411239..a81a193fa13681 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
+@@ -1262,7 +1262,7 @@ vop: vop@fdd90000 {
+ 			 <&cru DCLK_VOP2>,
+ 			 <&cru DCLK_VOP3>,
+ 			 <&cru PCLK_VOP_ROOT>,
+-			 <&hdptxphy_hdmi0>;
++			 <&hdptxphy0>;
+ 		clock-names = "aclk",
+ 			      "hclk",
+ 			      "dclk_vp0",
+@@ -1387,7 +1387,7 @@ hdmi0: hdmi@fde80000 {
+ 			     <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 @@ dmac2: dma-controller@fed10000 {
+ 		#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 9d525c8ff725b9..9eda69722665fd 100644
+--- 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 @@ hdmi0_out_con: endpoint {
+ 	};
+ };
+
+-&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 92f0ed83c99022..d1be72eb63a4e6 100644
+--- 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 @@ hdmi0_out_con: endpoint {
+ 	};
+ };
+
+-&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 ba49f0bbaac623..3fd0665cde2ca1 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
+@@ -364,7 +364,7 @@ hdmi0_out_con: endpoint {
+ 	};
+ };
+
+-&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 2be5251d3e3be6..e086114c763487 100644
+--- 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 @@ hdmi0_out_con: endpoint {
+ 	};
+ };
+
+-&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 b3a04ca370bb92..8171fbfd819a7b 100644
+--- 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 @@ hdmi0_out_con: endpoint {
+ 	};
+ };
+
+-&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 4791b77f3571db..c8bc85b7d1339c 100644
+--- 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 @@ hdmi0_out_con: endpoint {
+ 	};
+ };
+
+-&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 90f823b2c2191d..ef56380530f9ab 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts
+@@ -303,7 +303,7 @@ hdmi0_out_con: endpoint {
+ 	};
+ };
+
+-&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 cb350727d11680..0d9b5020acc099 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+@@ -360,7 +360,7 @@ hdmi0_out_con: endpoint {
+ 	};
+ };
+
+-&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 ce44549babf48a..9baca7f9ce4830 100644
+--- 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 @@ hdmi0_out_con: endpoint {
+ 	};
+ };
+
+-&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 255e33c5dbdc08..0f874b87b47e4c 100644
+--- 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 @@ hdmi0_out_con: endpoint {
+ 	};
+ };
+
+-&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 d597112f1d5b8e..86a9f2f35e6675 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+@@ -220,7 +220,7 @@ hdmi0_out_con: endpoint {
+ 	};
+ };
+
+-&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 3187b4918a300d..795d8175e65427 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts
+@@ -189,7 +189,7 @@ hdmi0_out_con: endpoint {
+ 	};
+ };
+
+-&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 9c394f733bbfbb..f471baca6d3101 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
+@@ -236,7 +236,7 @@ hdmi0_out_con: endpoint {
+ 	};
+ };
+
+-&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 4a3aa80f2226fd..74a4f03e05e351 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
+@@ -278,7 +278,7 @@ hdmi0_out_con: endpoint {
+ 	};
+ };
+
+-&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 d2eddea1840f4f..cd47969fadba05 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
+@@ -251,7 +251,7 @@ hdmi0_out_con: endpoint {
+ 	};
+ };
+
+-&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 8f034c6d494c4a..1463bd36b1b2e3 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
+@@ -264,7 +264,7 @@ hdmi0_out_con: endpoint {
+ 	};
+ };
+
+-&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 d86aeacca238d9..9e16960b87055a 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi
+@@ -197,7 +197,7 @@ hdmi0_out_con: endpoint {
+ 	};
+ };
+
+-&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 70a43432bdc57d..676cc4fec269ef 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
+@@ -334,7 +334,7 @@ hdmi0_out_con: endpoint {
+ 	};
+ };
+
+-&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 6e56d7704cbe0d..9dcf774706ca87 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts
+@@ -278,7 +278,7 @@ hdmi0_out_con: endpoint {
+ 	};
+ };
+
+-&hdptxphy_hdmi0 {
++&hdptxphy0 {
+ 	status = "okay";
+ };
+
+-- 
+cgit 1.2.3-korg
+