From 3850cdc48d16769e604053c81326a4b2d24892da Mon Sep 17 00:00:00 2001
From: Evoke Zhang <evoke.zhang@amlogic.com>
Date: Mon, 22 Jul 2019 18:27:14 +0800
Subject: [PATCH] vdac: optimize the vdac controlling [1/1]

PD#SWPL-8385

Problem:
no cvbsout on ab311

Solution:
1.optimize the vdac controlling
2.enable cvbsout in ab311 dts

Verify:
ab311

Change-Id: Ib046e760eca1c9ad3ae30749c546aff538504b33
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
---
 MAINTAINERS                                        | 5 +++++
 arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts     | 2 +-
 arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts   | 2 +-
 drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_hw.c | 4 +---
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 379a3b888f84..b4029f7a8682 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14996,6 +14996,11 @@ F:	arch/arm64/configs/meson64_a64_defconfig
 F:	arch/arm/boot/dts/amlogic/Makefile
 F:	arch/arm64/boot/dts/amlogic/Makefile
 
+AMLOGIC VDAC
+M:      Evoke Zhang <evoke.zhang@amlogic.com>
+F:      drivers/amlogic/media/vout/vdac/vdac_dev.h
+F:	drivers/amlogic/media/vout/vdac/vdac_config.c
+
 AMLOGIC DRM
 M:	Dezhi Kong <dezhi.kong@amlogic.com>
 F:	arch/arm/boot/dts/amlogic/mesonsm1_drm.dtsi
diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
index c8d871a56f4d..65887a7628e3 100644
--- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
@@ -596,7 +596,7 @@
 
 	cvbsout {
 		compatible = "amlogic, cvbsout-tm2";
-		status = "disabled";
+		status = "okay";
 		clocks = <&clkc CLKID_VCLK2_ENCI
 			&clkc CLKID_VCLK2_VENCI0
 			&clkc CLKID_VCLK2_VENCI1
diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
index e15e27224e29..8f9e615d98ee 100644
--- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
@@ -591,7 +591,7 @@
 
 	cvbsout {
 		compatible = "amlogic, cvbsout-tm2";
-		status = "disabled";
+		status = "okay";
 		clocks = <&clkc CLKID_VCLK2_ENCI
 			&clkc CLKID_VCLK2_VENCI0
 			&clkc CLKID_VCLK2_VENCI1
diff --git a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_hw.c b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_hw.c
index e5b18d8f2dc8..a8e113a612dd 100644
--- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_hw.c
+++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_hw.c
@@ -35,6 +35,7 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/amlogic/media/frame_provider/tvin/tvin.h>
+#include <linux/amlogic/media/vout/vdac_dev.h>
 #include <linux/arm-smccc.h>
 #include <linux/slab.h>
 #include <linux/dma-mapping.h>
@@ -2577,9 +2578,6 @@ void rx_aud_pll_ctl(bool en)
 	if (rx.chip_id >= CHIP_ID_TL1) {
 		if (en) {
 			/* AUD_CLK=N/CTS*TMDS_CLK */
-			/* bandgap enable */
-			wr_reg_hhi(HHI_VDAC_CNTL0, 0x906001);
-			wr_reg_hhi(HHI_VDAC_CNTL1, 0x0);
 			wr_reg_hhi(HHI_AUD_PLL_CNTL, 0x40001540);
 			#if 1
 			/* use mpll */