aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/dispc.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@nokia.com>2010-02-23 10:40:00 -0500
committerTomi Valkeinen <tomi.valkeinen@nokia.com>2010-02-23 10:43:39 -0500
commit63cf28ac3e3166a02a4e0db6168cf403ed66e3a5 (patch)
tree9574fb6566fc1bd872aa0932732e75c028857036 /drivers/video/omap2/dss/dispc.c
parent6d2e0bd60848e97756f40e49da207e862f4f3851 (diff)
OMAP: DSS2: fix get_dsi/dispc_clk_source() usage
After changing the selection of DSI and DISPC clock source the users of get_dsi/dispc_clk_source() functions were left unchanged. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'drivers/video/omap2/dss/dispc.c')
-rw-r--r--drivers/video/omap2/dss/dispc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 7781c65bbeba..212cb800a5d2 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -2198,7 +2198,7 @@ unsigned long dispc_fclk_rate(void)
2198{ 2198{
2199 unsigned long r = 0; 2199 unsigned long r = 0;
2200 2200
2201 if (dss_get_dispc_clk_source() == 0) 2201 if (dss_get_dispc_clk_source() == DSS_SRC_DSS1_ALWON_FCLK)
2202 r = dss_clk_get_rate(DSS_CLK_FCK1); 2202 r = dss_clk_get_rate(DSS_CLK_FCK1);
2203 else 2203 else
2204#ifdef CONFIG_OMAP2_DSS_DSI 2204#ifdef CONFIG_OMAP2_DSS_DSI
@@ -2251,7 +2251,7 @@ void dispc_dump_clocks(struct seq_file *s)
2251 seq_printf(s, "- DISPC -\n"); 2251 seq_printf(s, "- DISPC -\n");
2252 2252
2253 seq_printf(s, "dispc fclk source = %s\n", 2253 seq_printf(s, "dispc fclk source = %s\n",
2254 dss_get_dispc_clk_source() == 0 ? 2254 dss_get_dispc_clk_source() == DSS_SRC_DSS1_ALWON_FCLK ?
2255 "dss1_alwon_fclk" : "dsi1_pll_fclk"); 2255 "dss1_alwon_fclk" : "dsi1_pll_fclk");
2256 2256
2257 seq_printf(s, "fck\t\t%-16lu\n", dispc_fclk_rate()); 2257 seq_printf(s, "fck\t\t%-16lu\n", dispc_fclk_rate());