diff options
author | Archit Taneja <archit@ti.com> | 2012-05-07 07:21:35 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-05-09 06:43:11 -0400 |
commit | a2e5d82758a82b4848f00b1f28f8f71920e1b076 (patch) | |
tree | 0b89a775f46fdf89bbc10d48e36f7e06e6106b0e /drivers/video | |
parent | 9b9c457b43a0bfe227c5016606a2543e2ac4424e (diff) |
OMAPDSS: Fix DSI_FCLK clock source selection
The wrong bit field was being updated in DSS_CTRL when trying to configure the
clock source of DSI2 functional clock. Use the correct bit field based on the
dsi module number.
Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/omap2/dss/dss.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c index e731aa46eea..e212acb1e7d 100644 --- a/drivers/video/omap2/dss/dss.c +++ b/drivers/video/omap2/dss/dss.c | |||
@@ -335,7 +335,7 @@ void dss_select_dsi_clk_source(int dsi_module, | |||
335 | enum omap_dss_clk_source clk_src) | 335 | enum omap_dss_clk_source clk_src) |
336 | { | 336 | { |
337 | struct platform_device *dsidev; | 337 | struct platform_device *dsidev; |
338 | int b; | 338 | int b, pos; |
339 | 339 | ||
340 | switch (clk_src) { | 340 | switch (clk_src) { |
341 | case OMAP_DSS_CLK_SRC_FCK: | 341 | case OMAP_DSS_CLK_SRC_FCK: |
@@ -357,7 +357,8 @@ void dss_select_dsi_clk_source(int dsi_module, | |||
357 | BUG(); | 357 | BUG(); |
358 | } | 358 | } |
359 | 359 | ||
360 | REG_FLD_MOD(DSS_CONTROL, b, 1, 1); /* DSI_CLK_SWITCH */ | 360 | pos = dsi_module == 0 ? 1 : 10; |
361 | REG_FLD_MOD(DSS_CONTROL, b, pos, pos); /* DSIx_CLK_SWITCH */ | ||
361 | 362 | ||
362 | dss.dsi_clk_source[dsi_module] = clk_src; | 363 | dss.dsi_clk_source[dsi_module] = clk_src; |
363 | } | 364 | } |