86e3c31bcc
This is an automatically generated commit which aids following Kernel patch history, as git will see the move and copy as a rename thus defeating the purpose. For the original discussion see: https://lists.openwrt.org/pipermail/openwrt-devel/2023-October/041673.html Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org> Link: https://github.com/openwrt/openwrt/pull/23139 Signed-off-by: Nick Hainke <vincent@systemli.org>
95 lines
1.8 KiB
Diff
95 lines
1.8 KiB
Diff
From 77cea7ca13680e14119a3b9635c7ef16cd7ee44e Mon Sep 17 00:00:00 2001
|
|
From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
|
|
Date: Wed, 11 Dec 2024 01:06:17 +0200
|
|
Subject: arm64: dts: rockchip: Enable HDMI1 on rock-5b
|
|
|
|
Add the necessary DT changes to enable the second HDMI output port on
|
|
Radxa ROCK 5B.
|
|
|
|
While at it, switch the position of &vop_mmu and @vop to maintain the
|
|
alphabetical order.
|
|
|
|
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
|
|
Tested-by: Alexandre ARNOUD <aarnoud@me.com>
|
|
Link: https://lore.kernel.org/r/20241211-rk3588-hdmi1-v2-4-02cdca22ff68@collabora.com
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
|
|
@@ -49,6 +49,17 @@
|
|
};
|
|
};
|
|
|
|
+ hdmi1-con {
|
|
+ compatible = "hdmi-connector";
|
|
+ type = "a";
|
|
+
|
|
+ port {
|
|
+ hdmi1_con_in: endpoint {
|
|
+ remote-endpoint = <&hdmi1_out_con>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+
|
|
leds {
|
|
compatible = "gpio-leds";
|
|
pinctrl-names = "default";
|
|
@@ -220,10 +231,32 @@
|
|
};
|
|
};
|
|
|
|
+&hdmi1 {
|
|
+ pinctrl-0 = <&hdmim0_tx1_cec &hdmim0_tx1_hpd
|
|
+ &hdmim1_tx1_scl &hdmim1_tx1_sda>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&hdmi1_in {
|
|
+ hdmi1_in_vp1: endpoint {
|
|
+ remote-endpoint = <&vp1_out_hdmi1>;
|
|
+ };
|
|
+};
|
|
+
|
|
+&hdmi1_out {
|
|
+ hdmi1_out_con: endpoint {
|
|
+ remote-endpoint = <&hdmi1_con_in>;
|
|
+ };
|
|
+};
|
|
+
|
|
&hdptxphy0 {
|
|
status = "okay";
|
|
};
|
|
|
|
+&hdptxphy1 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&i2c0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&i2c0m2_xfer>;
|
|
@@ -891,11 +924,11 @@
|
|
status = "okay";
|
|
};
|
|
|
|
-&vop_mmu {
|
|
+&vop {
|
|
status = "okay";
|
|
};
|
|
|
|
-&vop {
|
|
+&vop_mmu {
|
|
status = "okay";
|
|
};
|
|
|
|
@@ -905,3 +938,10 @@
|
|
remote-endpoint = <&hdmi0_in_vp0>;
|
|
};
|
|
};
|
|
+
|
|
+&vp1 {
|
|
+ vp1_out_hdmi1: endpoint@ROCKCHIP_VOP2_EP_HDMI1 {
|
|
+ reg = <ROCKCHIP_VOP2_EP_HDMI1>;
|
|
+ remote-endpoint = <&hdmi1_in_vp1>;
|
|
+ };
|
|
+};
|