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>
This commit is contained in:
Evoke Zhang
2019-07-22 18:27:14 +08:00
committed by Luke Go
parent 9fc86a6eb4
commit 3850cdc48d
4 changed files with 8 additions and 5 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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 */