Commit 6553b210 authored Mar 31, 2011 by Archit Taneja Committed by Tomi Valkeinen Apr 15, 2011

OMAP: DSS2: Fix: Return correct lcd clock source for OMAP2/3

dss.lcd_clk_source is set to the default value DSS_CLK_SRC_FCK at dss_init.
For OMAP2 and OMAP3, the dss.lcd_clk_source should always be the same as
dss.dispc_clk_source. The function dss_get_lcd_clk_source() always returns the
default value DSS_CLK_SRC_FCK for OMAP2/3. This leads to wrong clock dumps when
dispc_clk_source is not DSS_CLK_SRC_FCK.

Correct this function to always return dss.dispc_clk_source for OMAP2/3.

Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

parent 4eb68edb

drivers/video/omap2/dss/dss.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -385,8 +385,14 @@ enum dss_clk_source dss_get_dsi_clk_source(void)

		enum dss_clk_source dss_get_lcd_clk_source(enum omap_channel channel)
		{
		if (dss_has_feature(FEAT_LCD_CLK_SRC)) {
		int ix = channel == OMAP_DSS_CHANNEL_LCD ? 0 : 1;
		return dss.lcd_clk_source[ix];
		} else {
		/* LCD_CLK source is the same as DISPC_FCLK source for
		* OMAP2 and OMAP3 */
		return dss.dispc_clk_source;
		}
		}

		/* calculate clock rates using dividers in cinfo */