From 13aaffe4b305ab2cf459a87c320151a6c4e35fae Mon Sep 17 00:00:00 2001
From: "congyang.huang" <congyang.huang@amlogic.com>
Date: Wed, 10 Jan 2024 19:50:02 +0800
Subject: [PATCH] vout: enable dummy_l&vout_meas&cvbs for s7 [1/1]

PD#SWPL-152445

Problem:
need to support dummy_l&vout_meas&cvbs

Solution:
enable dummy_l&vout_meas&cvbs

Verify:
s7

Test:
DRM-OSD-26

Change-Id: I7a0aeaca5e772efec95c3bdc8a46415019969fb4
Signed-off-by: congyang.huang <congyang.huang@amlogic.com>
---
 arch/arm64/boot/dts/amlogic/meson-s7.dtsi     |  6 ++--
 arch/arm64/boot/dts/amlogic/mesons7_drm.dtsi  | 32 +++++++++----------
 arch/arm64/boot/dts/amlogic/s7_pxp.dts        |  2 +-
 .../boot/dts/amlogic/s7_s905y5_bh201.dts      |  2 +-
 .../boot/dts/amlogic/s7_s905y5_bh202.dts      |  2 +-
 .../boot/dts/amlogic/s7_s905y5_bh209.dts      |  2 +-
 6 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-s7.dtsi b/arch/arm64/boot/dts/amlogic/meson-s7.dtsi
index bea922a1c..1f0399602 100644
--- a/arch/arm64/boot/dts/amlogic/meson-s7.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-s7.dtsi
@@ -1309,11 +1309,13 @@
 	vout_mux: vout_mux {
 		compatible = "amlogic, vout_mux";
 		status = "okay";
+		clocks = <&clkc CLKID_FCLK_DIV5>, <&clkc CLKID_VDIN_MEAS>;
+		clock-names = "fclk_div5", "vdin_meas_clk";
 	};
 
 	dummy_venc: dummy_venc {
-		compatible = "amlogic, dummy_venc_s4";
-		status = "disabled";
+		compatible = "amlogic, dummy_venc_s1a";
+		status = "okay";
 
 		ports {
 			port {
diff --git a/arch/arm64/boot/dts/amlogic/mesons7_drm.dtsi b/arch/arm64/boot/dts/amlogic/mesons7_drm.dtsi
index 2d0c751a5..dd37650b3 100644
--- a/arch/arm64/boot/dts/amlogic/mesons7_drm.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesons7_drm.dtsi
@@ -20,10 +20,10 @@
 			port {
 				#address-cells = <1>;
 				#size-cells = <0>;
-//				cvbs_to_drm: endpoint@1 {
-//					reg = <1>;
-//					remote-endpoint = <&drm_to_cvbs>;
-//				};
+				cvbs_to_drm: endpoint@1 {
+					reg = <1>;
+					remote-endpoint = <&drm_to_cvbs>;
+				};
 			};
 		};
 	};
@@ -47,14 +47,14 @@
 				reg = <0>;
 				remote-endpoint = <&hdmitx_to_drm>;
 			};
-//			drm_to_cvbs: endpoint@1 {
-//				reg = <1>;
-//				remote-endpoint = <&cvbs_to_drm>;
-//			};
-//			drm_to_dummyl: endpoint@2 {
-//				reg = <2>;
-//				remote-endpoint = <&dummyl_to_drm>;
-//			};
+			drm_to_cvbs: endpoint@1 {
+				reg = <1>;
+				remote-endpoint = <&cvbs_to_drm>;
+			};
+			drm_to_dummyl: endpoint@2 {
+				reg = <2>;
+				remote-endpoint = <&dummyl_to_drm>;
+			};
 		};
 	};
 
@@ -207,10 +207,10 @@
 		port {
 			#address-cells = <1>;
 			#size-cells = <0>;
-//			dummyl_to_drm: endpoint@0 {
-//				reg = <0>;
-//				remote-endpoint = <&drm_to_dummyl>;
-//			};
+			dummyl_to_drm: endpoint@0 {
+				reg = <0>;
+				remote-endpoint = <&drm_to_dummyl>;
+			};
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/amlogic/s7_pxp.dts b/arch/arm64/boot/dts/amlogic/s7_pxp.dts
index 5c895cb5b..c40709206 100644
--- a/arch/arm64/boot/dts/amlogic/s7_pxp.dts
+++ b/arch/arm64/boot/dts/amlogic/s7_pxp.dts
@@ -1124,7 +1124,7 @@
 };
 
 &drm_amcvbsout {
-	status = "disabled";
+	status = "okay";
 };
 
 /*if you want to use vdin just modify status to "ok"*/
diff --git a/arch/arm64/boot/dts/amlogic/s7_s905y5_bh201.dts b/arch/arm64/boot/dts/amlogic/s7_s905y5_bh201.dts
index 1834c6f20..0b352c57f 100644
--- a/arch/arm64/boot/dts/amlogic/s7_s905y5_bh201.dts
+++ b/arch/arm64/boot/dts/amlogic/s7_s905y5_bh201.dts
@@ -1246,7 +1246,7 @@
 };
 
 &drm_amcvbsout {
-	status = "disabled";
+	status = "okay";
 };
 
 /*if you want to use vdin just modify status to "ok"*/
diff --git a/arch/arm64/boot/dts/amlogic/s7_s905y5_bh202.dts b/arch/arm64/boot/dts/amlogic/s7_s905y5_bh202.dts
index 7f35f76df..1182df682 100644
--- a/arch/arm64/boot/dts/amlogic/s7_s905y5_bh202.dts
+++ b/arch/arm64/boot/dts/amlogic/s7_s905y5_bh202.dts
@@ -1197,7 +1197,7 @@
 };
 
 &drm_amcvbsout {
-	status = "disabled";
+	status = "okay";
 };
 
 /*if you want to use vdin just modify status to "ok"*/
diff --git a/arch/arm64/boot/dts/amlogic/s7_s905y5_bh209.dts b/arch/arm64/boot/dts/amlogic/s7_s905y5_bh209.dts
index 96c924126..e31b2db32 100644
--- a/arch/arm64/boot/dts/amlogic/s7_s905y5_bh209.dts
+++ b/arch/arm64/boot/dts/amlogic/s7_s905y5_bh209.dts
@@ -1312,7 +1312,7 @@
 };
 
 &drm_amcvbsout {
-	status = "disabled";
+	status = "okay";
 };
 
 /*if you want to use vdin just modify status to "ok"*/