HDMI: Select correct clock source.

Select correct clock source for HDMI pll.

Change-Id: I053c056926928b281f0b796b9d9d126de50a3f86
Signed-off-by: Dandawate Saket <dsaket@ti.com>

diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
old mode 100644 (file)
new mode 100755 (executable)
index f4e6f43..1eb6490
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -322,7 +322,7 @@ static void dss_dump_regs(struct seq_file *s)
 #undef DUMPREG
 }
 
-static void dss_select_dispc_clk_source(enum omap_dss_clk_source clk_src)
+void dss_select_dispc_clk_source(enum omap_dss_clk_source clk_src)
 {
        struct platform_device *dsidev;
        int b;

diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index 981fcf86d728d6bc8111e7f7be6a10f759e3ac18..2dcb55b3c7d4ed312a8549456063c78480edd893 100755 (executable)
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -283,6 +283,7 @@ void dss_sdi_init(int datapairs);
 int dss_sdi_enable(void);
 void dss_sdi_disable(void);
 
+void dss_select_dispc_clk_source(enum omap_dss_clk_source clk_src);
 void dss_select_dsi_clk_source(int dsi_module,
                enum omap_dss_clk_source clk_src);
 void dss_select_lcd_clk_source(enum omap_channel channel,

diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 89619568c3ecc7335bcac652e746ffb258200ab2..a731144d7d4503f23e413b08cc2745577db1d50a 100755 (executable)
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -949,6 +949,17 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
 
        hdmi.ip_data.ops->video_configure(&hdmi.ip_data);
 
+       /* Make selection of HDMI in DSS */
+       dss_select_hdmi_venc_clk_source(DSS_HDMI_M_PCLK);
+
+       /* Select the dispc clock source as PRCM clock, to ensure that it is not
+        * DSI PLL source as the clock selected by DSI PLL might not be
+        * sufficient for the resolution selected / that can be changed
+        * dynamically by user. This can be moved to single location , say
+        * Boardfile.
+        */
+       dss_select_dispc_clk_source(dssdev->clocks.dispc.dispc_fclk_src);
+
        /* bypass TV gamma table */
        dispc_enable_gamma_table(0);