[PATCH V2] arm64: dts: rockchip: Enable HDMI1 out for Edgeble-6TOPS Modules

[PATCH V2] arm64: dts: rockchip: Enable HDMI1 out for Edgeble-6TOPS Modules

[Jagan Teki]

Edgeble-6TOPS modules configure HDMI1 for HDMI Out from RK3588.

Enable it on Edgeble-6TOPS IO Board dtsi.

Cc: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Signed-off-by: Jagan Teki <jagan@edgeble.ai>
---
Changes for v2:
- Rebase on top of Cristian's series
https://patchwork.kernel.org/project/linux-rockchip/cover/20241211-rk3588-hdmi1-v2-0-02cdca22ff68@collabora.com/
- Update hdptxphy1

 .../dts/rockchip/rk3588-edgeble-neu6a-io.dtsi | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi
index 7125790bbed2..08920344a4b8 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi
@@ -4,12 +4,24 @@
  */
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/soc/rockchip,vop2.h>
 
 / {
 	chosen {
 		stdout-path = "serial2:1500000n8";
 	};
 
+	hdmi1-con {
+		compatible = "hdmi-connector";
+		type = "a";
+
+		port {
+			hdmi1_con_in: endpoint {
+				remote-endpoint = <&hdmi1_out_con>;
+			};
+		};
+	};
+
 	/* Unnamed gated oscillator: 100MHz,3.3V,3225 */
 	pcie30_port0_refclk: pcie30_port1_refclk: pcie-oscillator {
 		compatible = "gated-fixed-clock";
@@ -81,6 +93,26 @@ &combphy2_psu {
 	status = "okay";
 };
 
+&hdmi1 {
+	status = "okay";
+};
+
+&hdmi1_in {
+	hdmi1_in_vp0: endpoint {
+		remote-endpoint = <&vp0_out_hdmi1>;
+	};
+};
+
+&hdmi1_out {
+	hdmi1_out_con: endpoint {
+		remote-endpoint = <&hdmi1_con_in>;
+	};
+};
+
+&hdptxphy1 {
+	status = "okay";
+};
+
 &i2c6 {
 	status = "okay";
 
@@ -275,3 +307,18 @@ &usb_host1_ohci {
 &usb_host2_xhci {
 	status = "okay";
 };
+
+&vop_mmu {
+	status = "okay";
+};
+
+&vop {
+	status = "okay";
+};
+
+&vp0 {
+	vp0_out_hdmi1: endpoint@ROCKCHIP_VOP2_EP_HDMI1 {
+		reg = <ROCKCHIP_VOP2_EP_HDMI1>;
+		remote-endpoint = <&hdmi1_in_vp0>;
+	};
+};
-- 
2.34.1

Re: [PATCH V2] arm64: dts: rockchip: Enable HDMI1 out for Edgeble-6TOPS Modules

[Jagan Teki]

Hi Heiko,

On Fri, 27 Dec 2024 at 18:59, Jagan Teki <jagan@edgeble.ai> wrote:
>
> Edgeble-6TOPS modules configure HDMI1 for HDMI Out from RK3588.
>
> Enable it on Edgeble-6TOPS IO Board dtsi.
>
> Cc: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
> Signed-off-by: Jagan Teki <jagan@edgeble.ai>
> ---
> Changes for v2:
> - Rebase on top of Cristian's series
> https://patchwork.kernel.org/project/linux-rockchip/cover/20241211-rk3588-hdmi1-v2-0-02cdca22ff68@collabora.com/
> - Update hdptxphy1

Cristian's seems merged, please queue this as well.

Thanks,
Jagan.

Re: [PATCH V2] arm64: dts: rockchip: Enable HDMI1 out for Edgeble-6TOPS Modules

[Heiko Stübner]

Hi Jagan,

Am Montag, 10. Februar 2025, 13:51:07 MEZ schrieb Jagan Teki:
> On Fri, 27 Dec 2024 at 18:59, Jagan Teki <jagan@edgeble.ai> wrote:
> >
> > Edgeble-6TOPS modules configure HDMI1 for HDMI Out from RK3588.
> >
> > Enable it on Edgeble-6TOPS IO Board dtsi.
> >
> > Cc: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
> > Signed-off-by: Jagan Teki <jagan@edgeble.ai>
> > ---
> > Changes for v2:
> > - Rebase on top of Cristian's series
> > https://patchwork.kernel.org/project/linux-rockchip/cover/20241211-rk3588-hdmi1-v2-0-02cdca22ff68@collabora.com/
> > - Update hdptxphy1
> 
> Cristian's seems merged, please queue this as well.

only partially, i.e. I merged patch 1 of 4, because actually enabling the
hdmi1 controller needs the alias-removal from the phy driver, see
Cristian's link "[1]" in his cover letter.

And phy maintainers seem to still be otherwise occupied [2].

Heiko

[1] https://lore.kernel.org/lkml/20241206103401.1780416-3-heiko@sntech.de/
[2] https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git/log/?h=next

Re: [PATCH V2] arm64: dts: rockchip: Enable HDMI1 out for Edgeble-6TOPS Modules

[Heiko Stuebner]

On Fri, 27 Dec 2024 18:59:36 +0530, Jagan Teki wrote:
> Edgeble-6TOPS modules configure HDMI1 for HDMI Out from RK3588.
> 
> Enable it on Edgeble-6TOPS IO Board dtsi.
> 
> 

Applied, thanks!

[1/1] arm64: dts: rockchip: Enable HDMI1 out for Edgeble-6TOPS Modules
      commit: 4a2fdf91e1239d9659d0317f3e8e37681ac555a4

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>