summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorArchit Taneja2012-05-07 13:21:35 +0200
committerTomi Valkeinen2012-05-09 12:43:11 +0200
commita2e5d82758a82b4848f00b1f28f8f71920e1b076 (patch)
tree0b89a775f46fdf89bbc10d48e36f7e06e6106b0e /drivers/video
parentOMAPDSS: HDMI: define and dump CORE registers in correct order (diff)
downloadkernel-qcow2-linux-a2e5d82758a82b4848f00b1f28f8f71920e1b076.tar.gz
kernel-qcow2-linux-a2e5d82758a82b4848f00b1f28f8f71920e1b076.tar.xz
kernel-qcow2-linux-a2e5d82758a82b4848f00b1f28f8f71920e1b076.zip
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.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index e731aa46eeaf..e212acb1e7d5 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,
enum omap_dss_clk_source clk_src)
{
struct platform_device *dsidev;
- int b;
+ int b, pos;
switch (clk_src) {
case OMAP_DSS_CLK_SRC_FCK:
@@ -357,7 +357,8 @@ void dss_select_dsi_clk_source(int dsi_module,
BUG();
}
- REG_FLD_MOD(DSS_CONTROL, b, 1, 1); /* DSI_CLK_SWITCH */
+ pos = dsi_module == 0 ? 1 : 10;
+ REG_FLD_MOD(DSS_CONTROL, b, pos, pos); /* DSIx_CLK_SWITCH */
dss.dsi_clk_source[dsi_module] = clk_src;
}