From 69de168758dadb0123ceee21ea4820ec065e3d44 Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Thu, 31 Mar 2011 13:23:35 +0530 Subject: [PATCH] --- yaml --- r: 250995 b: refs/heads/master c: 6553b2105c8871dae8dfff244440e793f3a6bdb9 h: refs/heads/master i: 250993: 23aa15c28afb52efc7b4ec4acade6f4152be1e83 250991: da667729c051f31cb701d8754884e4416330be18 v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/dss.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f3bff353cc99..768f55cc0031 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4eb68edb7d21aff81765a065680270693c23fbfc +refs/heads/master: 6553b2105c8871dae8dfff244440e793f3a6bdb9 diff --git a/trunk/drivers/video/omap2/dss/dss.c b/trunk/drivers/video/omap2/dss/dss.c index 3f1fee63c678..c3b48a0fcf35 100644 --- a/trunk/drivers/video/omap2/dss/dss.c +++ b/trunk/drivers/video/omap2/dss/dss.c @@ -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) { - int ix = channel == OMAP_DSS_CHANNEL_LCD ? 0 : 1; - return dss.lcd_clk_source[ix]; + 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 */