aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMythri P K <mythripk@ti.com>2011-03-09 06:01:38 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-03-16 02:15:49 -0400
commit7ed024aa280cb38c8aa5c188d2d2c98f5daede10 (patch)
treef1ca3f2434bdb639414852efa5c92b196af77099 /drivers
parentb119601d4e226e42a067ff33116774d79dd9afbc (diff)
OMAP4: DSS2: HDMI: Select between HDMI VENC clock source.
Adding function to select between HDMI or VENC clock source. Signed-off-by: Mythri P K <mythripk@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/omap2/dss/dss.c5
-rw-r--r--drivers/video/omap2/dss/dss.h6
2 files changed, 11 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 562d8d28d4f2..f1628bd850d1 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -605,6 +605,11 @@ void dss_set_dac_pwrdn_bgz(bool enable)
605 REG_FLD_MOD(DSS_CONTROL, enable, 5, 5); /* DAC Power-Down Control */ 605 REG_FLD_MOD(DSS_CONTROL, enable, 5, 5); /* DAC Power-Down Control */
606} 606}
607 607
608void dss_select_hdmi_venc_clk_source(enum dss_hdmi_venc_clk_source_select hdmi)
609{
610 REG_FLD_MOD(DSS_CONTROL, hdmi, 15, 15); /* VENC_HDMI_SWITCH */
611}
612
608static int dss_init(void) 613static int dss_init(void)
609{ 614{
610 int r; 615 int r;
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index 26a43c93e489..eb05d39ef17c 100644
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -126,6 +126,11 @@ enum dss_clk_source {
126 * OMAP4: DSS_FCLK */ 126 * OMAP4: DSS_FCLK */
127}; 127};
128 128
129enum dss_hdmi_venc_clk_source_select {
130 DSS_VENC_TV_CLK = 0,
131 DSS_HDMI_M_PCLK = 1,
132};
133
129struct dss_clock_info { 134struct dss_clock_info {
130 /* rates that we get with dividers below */ 135 /* rates that we get with dividers below */
131 unsigned long fck; 136 unsigned long fck;
@@ -214,6 +219,7 @@ void dss_recheck_connections(struct omap_dss_device *dssdev, bool force);
214int dss_init_platform_driver(void); 219int dss_init_platform_driver(void);
215void dss_uninit_platform_driver(void); 220void dss_uninit_platform_driver(void);
216 221
222void dss_select_hdmi_venc_clk_source(enum dss_hdmi_venc_clk_source_select);
217void dss_save_context(void); 223void dss_save_context(void);
218void dss_restore_context(void); 224void dss_restore_context(void);
219void dss_clk_enable(enum dss_clock clks); 225void dss_clk_enable(enum dss_clock clks);