From acffc9179b87b9625bf62ec00aa67e23b90d0e49 Mon Sep 17 00:00:00 2001 From: Nian Jing Date: Wed, 28 Feb 2018 20:14:45 +0800 Subject: [PATCH] cvbs: drop busy mdelay, also update register settings PD#156734: cvbs: drop busy mdelay, also update register settings Change-Id: I7515dffda49bdd19407ebabf93ebfad5f8ce8125 Signed-off-by: Nian Jing Signed-off-by: Yixun Lan --- drivers/amlogic/media/vout/cvbs/enc_clk_config.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/amlogic/media/vout/cvbs/enc_clk_config.c b/drivers/amlogic/media/vout/cvbs/enc_clk_config.c index 0fdec2d52a12..30fe779bc056 100644 --- a/drivers/amlogic/media/vout/cvbs/enc_clk_config.c +++ b/drivers/amlogic/media/vout/cvbs/enc_clk_config.c @@ -88,19 +88,19 @@ void set_vmode_clk(void) udelay(5); } else if (cvbs_cpu_type() == CVBS_CPU_TYPE_G12A) { pr_info("config g12a hpll\n"); - cvbs_out_hiu_write(HHI_HDMI_PLL_CNTL, 0x3b00047b); + cvbs_out_hiu_write(HHI_HDMI_PLL_CNTL, 0x1b01047b); cvbs_out_hiu_write(HHI_HDMI_PLL_CNTL2, 0x00018000); cvbs_out_hiu_write(HHI_HDMI_PLL_CNTL3, 0x00000000); - cvbs_out_hiu_write(HHI_HDMI_PLL_CNTL4, 0x0a691c00); - cvbs_out_hiu_write(HHI_HDMI_PLL_CNTL5, 0x33771290); - cvbs_out_hiu_write(HHI_HDMI_PLL_CNTL6, 0x39270000); - cvbs_out_hiu_write(HHI_HDMI_PLL_CNTL7, 0x50540000); - cvbs_out_hiu_write(HHI_HDMI_PLL_CNTL, 0x1b00047b); + cvbs_out_hiu_write(HHI_HDMI_PLL_CNTL4, 0x6a29dc00); + cvbs_out_hiu_write(HHI_HDMI_PLL_CNTL5, 0x65771290); + cvbs_out_hiu_write(HHI_HDMI_PLL_CNTL6, 0x39272000); + cvbs_out_hiu_write(HHI_HDMI_PLL_CNTL7, 0x54540000); + cvbs_out_hiu_write(HHI_HDMI_PLL_CNTL, 0x3b01047b); + udelay(100); + cvbs_out_hiu_write(HHI_HDMI_PLL_CNTL, 0x1b01047b); ret = hpll_wait_lock(HHI_HDMI_PLL_CNTL, 31); if (ret) pr_info("[error]:hdmi_pll lock failed\n"); - msleep(100); - cvbs_out_hiu_write(HHI_HDMI_PLL_CNTL, 0x1b01047b); } else { cvbs_out_hiu_write(HHI_HDMI_PLL_CNTL, 0x4000027b); cvbs_out_hiu_write(HHI_HDMI_PLL_CNTL2, 0x800cb300);