aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@nokia.com>2009-12-03 06:37:31 -0500
committerTomi Valkeinen <tomi.valkeinen@nokia.com>2010-01-08 08:32:13 -0500
commit397bb3c2e0810d56518e5e111fcedb593823514f (patch)
tree55abf5757ebbf32d8d1215b730d3f80468e98291 /drivers/video/omap2
parent6b7b284958d47b77d06745b36bc7f36dab769d9b (diff)
OMAP: DSS2: DSI: fix VC channels in send_short and send_null
- dsi_vc_send_short() needs to use dest_per for the peripheral id - dsi_vc_send_null() was always using channel id 0 Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'drivers/video/omap2')
-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 5936487b5def..341c6bb2650b 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -1999,7 +1999,7 @@ static int dsi_vc_send_short(int channel, u8 data_type, u16 data, u8 ecc)
1999 return -EINVAL; 1999 return -EINVAL;
2000 } 2000 }
2001 2001
2002 data_id = data_type | channel << 6; 2002 data_id = data_type | dsi.vc[channel].dest_per << 6;
2003 2003
2004 r = (data_id << 0) | (data << 8) | (ecc << 24); 2004 r = (data_id << 0) | (data << 8) | (ecc << 24);
2005 2005
@@ -2011,7 +2011,7 @@ static int dsi_vc_send_short(int channel, u8 data_type, u16 data, u8 ecc)
2011int dsi_vc_send_null(int channel) 2011int dsi_vc_send_null(int channel)
2012{ 2012{
2013 u8 nullpkg[] = {0, 0, 0, 0}; 2013 u8 nullpkg[] = {0, 0, 0, 0};
2014 return dsi_vc_send_long(0, DSI_DT_NULL_PACKET, nullpkg, 4, 0); 2014 return dsi_vc_send_long(channel, DSI_DT_NULL_PACKET, nullpkg, 4, 0);
2015} 2015}
2016EXPORT_SYMBOL(dsi_vc_send_null); 2016EXPORT_SYMBOL(dsi_vc_send_null);
2017 2017