rk3288-mipi-dsi: fix send commad's methods.

diff --git a/drivers/video/rockchip/transmitter/mipi_dsi.c b/drivers/video/rockchip/transmitter/mipi_dsi.c
old mode 100644 (file)
new mode 100755 (executable)
index f764a07..3e910b3
--- a/drivers/video/rockchip/transmitter/mipi_dsi.c
+++ b/drivers/video/rockchip/transmitter/mipi_dsi.c
@@ -33,8 +33,9 @@
 *v1.0 : this driver is a top level architecture of mipi dsi driver;
 *v1.1 : add struct mipi_dsi_screen
 *v1.2 : add id argument to identify different dsi 
+*v1.3 : fix send commad's methods  
 */
-#define MIPI_DSI_VERSION_AND_TIME  "mipi_dsi v1.2 2014-03-07"
+#define MIPI_DSI_VERSION_AND_TIME  "mipi_dsi v1.3 2014-04-17"
 
 
 static struct mipi_dsi_ops *dsi_ops[MAX_DSI_CHIPS] = {NULL};
@@ -151,7 +152,7 @@ int dsi_set_regs(unsigned int id, void *array, u32 n) {
 }
 EXPORT_SYMBOL(dsi_set_regs);
 
-int dsi_init(unsigned int id, void *array, u32 n) {
+int dsi_init(unsigned int id, u32 n) {
 
        struct mipi_dsi_ops *ops = NULL;
 
@@ -164,7 +165,7 @@ int dsi_init(unsigned int id, void *array, u32 n) {
                return -EINVAL;
 
        if(ops->dsi_init)
-               ops->dsi_init(ops->dsi, array, n);
+               ops->dsi_init(ops->dsi, n);
 
        return 0;
 }
@@ -273,7 +274,7 @@ int dsi_send_dcs_packet(unsigned int id, unsigned char *packet, u32 n) {
 
        struct mipi_dsi_ops *ops = NULL;
 
-    printk("dsi_send_dcs_packet-------id=%d\n",id);
+    //printk("dsi_send_dcs_packet-------id=%d\n",id);
        if(id > (MAX_DSI_CHIPS - 1))
                return -EINVAL;
 
@@ -308,7 +309,7 @@ int dsi_read_dcs_packet(unsigned int id, unsigned char *packet, u32 n) {
 EXPORT_SYMBOL(dsi_read_dcs_packet);
 
 
-int dsi_send_packet(unsigned int id, void *packet, u32 n) {
+int dsi_send_packet(unsigned int id, unsigned char *packet, u32 n) {
 
        struct mipi_dsi_ops *ops = NULL;
 

diff --git a/drivers/video/rockchip/transmitter/mipi_dsi.h b/drivers/video/rockchip/transmitter/mipi_dsi.h
index c9201fef68b0ce84a55833d4b761ea29445b32ee..fc41f3aa5959a7032ccb89fa9da1c324e4b180ae 100755 (executable)
--- a/drivers/video/rockchip/transmitter/mipi_dsi.h
+++ b/drivers/video/rockchip/transmitter/mipi_dsi.h
@@ -189,14 +189,14 @@ struct mipi_dsi_ops {
        char name[32];
        void *dsi;
        int (*get_id)(void *);
-       int (*dsi_init)(void *, void *, u32 n);
+       int (*dsi_init)(void *, u32 n);
        int (*dsi_set_regs)(void *, void *, u32 n);
        int (*dsi_enable_video_mode)(void *, u32 enable);
        int (*dsi_enable_command_mode)(void *, u32 enable);
        int (*dsi_enable_hs_clk)(void *, u32 enable);
        int (*dsi_send_dcs_packet)(void *, unsigned char *, u32 n);
        int (*dsi_read_dcs_packet)(void *, unsigned char *, u32 n);
-       int (*dsi_send_packet)(void *, void *, u32 n);
+       int (*dsi_send_packet)(void *, unsigned char *, u32 n);
     int (*dsi_is_enable)(void *, u32 enable);
        int (*dsi_is_active)(void *);
        int (*power_up)(void *);
@@ -281,7 +281,7 @@ int del_dsi_ops(struct mipi_dsi_ops *ops);
 int dsi_power_up(unsigned int id);
 int dsi_power_off(unsigned int id);
 int dsi_probe_current_chip(unsigned int id);
-int dsi_init(unsigned int id, void *array, u32 n);
+int dsi_init(unsigned int id, u32 n);
 int dsi_is_active(unsigned int id);
 int dsi_enable_video_mode(unsigned int id, u32 enable);
 int dsi_enable_command_mode(unsigned int id, u32 enable);
@@ -291,7 +291,7 @@ int dsi_set_virtual_channel(unsigned int id, u32 channel);
 int dsi_set_regs(unsigned int id, void *array, u32 n);
 int dsi_send_dcs_packet(unsigned int id, unsigned char *packet, u32 n);
 int dsi_read_dcs_packet(unsigned int id, unsigned char *packet, u32 n);
-int dsi_send_packet(unsigned int id, void *packet, u32 n);
+int dsi_send_packet(unsigned int id, unsigned char *packet, u32 n);
 int dsi_is_enable(unsigned int id, u32 enable);
 
 #endif /* end of MIPI_DSI_H_ */