89 lines
2.7 KiB
Diff
89 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: ColorfulRhino <[email protected]>
|
|
Date: Sun, 11 Aug 2024 15:28:03 +0200
|
|
Subject: CM3588-NAS: Add HDMI support
|
|
|
|
---
|
|
arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts | 47 ++++++++++
|
|
1 file changed, 47 insertions(+)
|
|
|
|
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 111111111111..222222222222 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts
|
|
@@ -12,6 +12,7 @@
|
|
#include <dt-bindings/input/input.h>
|
|
#include <dt-bindings/pinctrl/rockchip.h>
|
|
#include <dt-bindings/usb/pd.h>
|
|
+#include <dt-bindings/soc/rockchip,vop2.h>
|
|
#include "rk3588-friendlyelec-cm3588.dtsi"
|
|
|
|
/ {
|
|
@@ -225,6 +226,12 @@ &combphy2_psu {
|
|
status = "okay";
|
|
};
|
|
|
|
+/* Properties "clock" and "clock-names" introduced by Collabora https://gitlab.collabora.com/hardware-enablement/rockchip-3588/linux/-/commit/8fff68cb7cfe1e698445896252e34f79fad41720 */
|
|
+&display_subsystem {
|
|
+ clocks = <&hdptxphy_hdmi0>;
|
|
+ clock-names = "hdmi0_phy_pll";
|
|
+};
|
|
+
|
|
/* GPIO names are in the format "Human-readable-name [SIGNAL_LABEL]" */
|
|
/* Signal labels match the official CM3588 NAS SDK schematic revision 2309 */
|
|
&gpio0 {
|
|
@@ -307,6 +314,31 @@ &gpio4 {
|
|
"", "", "", "";
|
|
};
|
|
|
|
+&hdmi0 {
|
|
+ // avdd-0v9-supply =
|
|
+ // avdd-1v8-supply =
|
|
+ /* Dmesg error/warning:
|
|
+ * [ +0.000055] dwhdmi-rockchip fde80000.hdmi: Looking up avdd-0v9-supply from device tree
|
|
+ * [ +0.000011] dwhdmi-rockchip fde80000.hdmi: Looking up avdd-0v9-supply property in node /hdmi@fde80000 failed
|
|
+ * [ +0.000014] dwhdmi-rockchip fde80000.hdmi: supply avdd-0v9 not found, using dummy regulator
|
|
+ * [ +0.000080] dwhdmi-rockchip fde80000.hdmi: Looking up avdd-1v8-supply from device tree
|
|
+ * [ +0.000010] dwhdmi-rockchip fde80000.hdmi: Looking up avdd-1v8-supply property in node /hdmi@fde80000 failed
|
|
+ * [ +0.000010] dwhdmi-rockchip fde80000.hdmi: supply avdd-1v8 not found, using dummy regulator
|
|
+ * [ +0.001009] dwhdmi-rockchip fde80000.hdmi: registered ddc I2C bus driver
|
|
+ */
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&hdmi0_in {
|
|
+ hdmi0_in_vp0: endpoint {
|
|
+ remote-endpoint = <&vp0_out_hdmi0>;
|
|
+ };
|
|
+};
|
|
+
|
|
+&hdptxphy_hdmi0 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
/* Connected to MIPI-DSI0 */
|
|
&i2c5 {
|
|
pinctrl-names = "default";
|
|
@@ -776,3 +808,18 @@ usbdp_phy0_dp_altmode_mux: endpoint@1 {
|
|
&usbdp_phy1 {
|
|
status = "okay";
|
|
};
|
|
+
|
|
+&vop {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&vop_mmu {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&vp0 {
|
|
+ vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
|
|
+ reg = <ROCKCHIP_VOP2_EP_HDMI0>;
|
|
+ remote-endpoint = <&hdmi0_in_vp0>;
|
|
+ };
|
|
+};
|
|
--
|
|
Armbian
|
|
|