aboutsummaryrefslogtreecommitdiff
path: root/drivers/video/omap2/dss/dispc.c
diff options
context:
space:
mode:
authorTaneja, Archit <archit@ti.com>2011-03-08 05:50:34 -0600
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-03-11 15:46:30 +0200
commit66534e8e936a0b926863df90054dc59826d70528 (patch)
treeb00e7998a08b47a7b1250086194e9bf95367dfa5 /drivers/video/omap2/dss/dispc.c
parent7b12d7b66bac4ff51aeea0029734b7a921cbe817 (diff)
OMAP2PLUS: DSS2: Cleanup clock source related code
Clean up some of the DSS functions which select/get clock sources, use switch to select the clock source members since more clock sources will be introduced later on. Remove the use of macro CONFIG_OMAP2_DSS_DSI in dispc_fclk_rate, use a dummy inline for function for dsi_get_pll_hsdiv_dispc_rate() instead for code clarity. Signed-off-by: Archit Taneja <archit@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/dispc.c')
-rw-r--r--drivers/video/omap2/dss/dispc.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 4a368c47700..28b690f2447 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -2341,14 +2341,17 @@ unsigned long dispc_fclk_rate(void)
{
unsigned long r = 0;
- if (dss_get_dispc_clk_source() == DSS_CLK_SRC_FCK)
+ switch (dss_get_dispc_clk_source()) {
+ case DSS_CLK_SRC_FCK:
r = dss_clk_get_rate(DSS_CLK_FCK);
- else
-#ifdef CONFIG_OMAP2_DSS_DSI
+ break;
+ case DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC:
r = dsi_get_pll_hsdiv_dispc_rate();
-#else
- BUG();
-#endif
+ break;
+ default:
+ BUG();
+ }
+
return r;
}