aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@nokia.com>2010-06-09 08:19:29 -0400
committerTomi Valkeinen <tomi.valkeinen@nokia.com>2010-08-03 08:18:47 -0400
commit0c244f770f7fdb3e6779b3433aac9cfb6deb3255 (patch)
tree19ead41feeb894682f382ac52be271b39e512727
parent0f16aa0ae6b84d7ae72fbe8999e6a94cb78edd4e (diff)
OMAP: DSS2: DSI: change dsi_vc_dcs_read_2 parameters
Change dsi_vc_dcs_read_2() data parameter to two u8 parameters to make the byte-order clear. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
-rw-r--r--arch/arm/plat-omap/include/plat/display.h2
-rw-r--r--drivers/video/omap2/dss/dsi.c8
2 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/include/plat/display.h b/arch/arm/plat-omap/include/plat/display.h
index fbbb966a994f..b8de70479313 100644
--- a/arch/arm/plat-omap/include/plat/display.h
+++ b/arch/arm/plat-omap/include/plat/display.h
@@ -238,7 +238,7 @@ int dsi_vc_dcs_write_1(int channel, u8 dcs_cmd, u8 param);
238int dsi_vc_dcs_write_nosync(int channel, u8 *data, int len); 238int dsi_vc_dcs_write_nosync(int channel, u8 *data, int len);
239int dsi_vc_dcs_read(int channel, u8 dcs_cmd, u8 *buf, int buflen); 239int dsi_vc_dcs_read(int channel, u8 dcs_cmd, u8 *buf, int buflen);
240int dsi_vc_dcs_read_1(int channel, u8 dcs_cmd, u8 *data); 240int dsi_vc_dcs_read_1(int channel, u8 dcs_cmd, u8 *data);
241int dsi_vc_dcs_read_2(int channel, u8 dcs_cmd, u16 *data); 241int dsi_vc_dcs_read_2(int channel, u8 dcs_cmd, u8 *data1, u8 *data2);
242int dsi_vc_set_max_rx_packet_size(int channel, u16 len); 242int dsi_vc_set_max_rx_packet_size(int channel, u16 len);
243int dsi_vc_send_null(int channel); 243int dsi_vc_send_null(int channel);
244int dsi_vc_send_bta_sync(int channel); 244int dsi_vc_send_bta_sync(int channel);
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index de3fdab46f38..767f6fb2bdfa 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -2235,11 +2235,12 @@ int dsi_vc_dcs_read_1(int channel, u8 dcs_cmd, u8 *data)
2235} 2235}
2236EXPORT_SYMBOL(dsi_vc_dcs_read_1); 2236EXPORT_SYMBOL(dsi_vc_dcs_read_1);
2237 2237
2238int dsi_vc_dcs_read_2(int channel, u8 dcs_cmd, u16 *data) 2238int dsi_vc_dcs_read_2(int channel, u8 dcs_cmd, u8 *data1, u8 *data2)
2239{ 2239{
2240 u8 buf[2];
2240 int r; 2241 int r;
2241 2242
2242 r = dsi_vc_dcs_read(channel, dcs_cmd, (u8 *)data, 2); 2243 r = dsi_vc_dcs_read(channel, dcs_cmd, buf, 2);
2243 2244
2244 if (r < 0) 2245 if (r < 0)
2245 return r; 2246 return r;
@@ -2247,6 +2248,9 @@ int dsi_vc_dcs_read_2(int channel, u8 dcs_cmd, u16 *data)
2247 if (r != 2) 2248 if (r != 2)
2248 return -EIO; 2249 return -EIO;
2249 2250
2251 *data1 = buf[0];
2252 *data2 = buf[1];
2253
2250 return 0; 2254 return 0;
2251} 2255}
2252EXPORT_SYMBOL(dsi_vc_dcs_read_2); 2256EXPORT_SYMBOL(dsi_vc_dcs_read_2);