aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2012-09-24 02:34:52 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-09-26 05:57:51 -0400
commite84dc1cc1503150e3bc37268a0b0f0bc0097622c (patch)
treece2f4596b3847c2c3e90c91f98823ccc11e5caac /drivers/video
parentd557a9cf2f4f9286759cdd1937ce98641fa35583 (diff)
OMAPDSS: DSI: fix tlpx_half reg field length
tlpx_half bit field in DSI_DSIPHY_CFG1 is [20,16], not [22,16] as accessed in the code currently. Fix this. The bug should not have caused any problems on OMAP3/4, as the bits 21,22 are unused. They are used on OMAP5, though. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap2/dss/dsi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 4d748139315d..abe335abca53 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -2289,7 +2289,7 @@ static void dsi_cio_timings(struct platform_device *dsidev)
2289 dsi_write_reg(dsidev, DSI_DSIPHY_CFG0, r); 2289 dsi_write_reg(dsidev, DSI_DSIPHY_CFG0, r);
2290 2290
2291 r = dsi_read_reg(dsidev, DSI_DSIPHY_CFG1); 2291 r = dsi_read_reg(dsidev, DSI_DSIPHY_CFG1);
2292 r = FLD_MOD(r, tlpx_half, 22, 16); 2292 r = FLD_MOD(r, tlpx_half, 20, 16);
2293 r = FLD_MOD(r, tclk_trail, 15, 8); 2293 r = FLD_MOD(r, tclk_trail, 15, 8);
2294 r = FLD_MOD(r, tclk_zero, 7, 0); 2294 r = FLD_MOD(r, tclk_zero, 7, 0);
2295 2295
@@ -4107,7 +4107,7 @@ static void dsi_proto_timings(struct omap_dss_device *dssdev)
4107 ths_exit = FLD_GET(r, 7, 0); 4107 ths_exit = FLD_GET(r, 7, 0);
4108 4108
4109 r = dsi_read_reg(dsidev, DSI_DSIPHY_CFG1); 4109 r = dsi_read_reg(dsidev, DSI_DSIPHY_CFG1);
4110 tlpx = FLD_GET(r, 22, 16) * 2; 4110 tlpx = FLD_GET(r, 20, 16) * 2;
4111 tclk_trail = FLD_GET(r, 15, 8); 4111 tclk_trail = FLD_GET(r, 15, 8);
4112 tclk_zero = FLD_GET(r, 7, 0); 4112 tclk_zero = FLD_GET(r, 7, 0);
4113 4113