Merge branch develop-3.10

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / gc0309.c

diff --git a/drivers/media/video/gc0309.c b/drivers/media/video/gc0309.c
index f51ae770b9cc4236fa882448c49aeb1dc12b3976..7204463605d8d86a584d927e0a66cb2cca540836 100755 (executable)
--- a/drivers/media/video/gc0309.c
+++ b/drivers/media/video/gc0309.c
@@ -22,9 +22,9 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define SENSOR_NAME RK29_CAM_SENSOR_GC0309\r
 #define SENSOR_V4L2_IDENT V4L2_IDENT_GC0309\r
 #define SENSOR_ID 0xa0\r
-#define SENSOR_BUS_PARAM                                        (SOCAM_MASTER |\\r
-                                                                                        SOCAM_PCLK_SAMPLE_RISING|SOCAM_HSYNC_ACTIVE_HIGH| SOCAM_VSYNC_ACTIVE_HIGH|\\r
-                                                                                        SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATAWIDTH_8  |SOCAM_MCLK_24MHZ)\r
+#define SENSOR_BUS_PARAM                     (V4L2_MBUS_MASTER |\\r
+                                                                                                        V4L2_MBUS_PCLK_SAMPLE_RISING|V4L2_MBUS_HSYNC_ACTIVE_HIGH| V4L2_MBUS_VSYNC_ACTIVE_HIGH|\\r
+                                                                                                        V4L2_MBUS_DATA_ACTIVE_HIGH  |SOCAM_MCLK_24MHZ)\r
 #define SENSOR_PREVIEW_W                                        640\r
 #define SENSOR_PREVIEW_H                                        480\r
 #define SENSOR_PREVIEW_FPS                                      15000     // 15fps \r
@@ -654,6 +654,7 @@ static      struct rk_sensor_reg sensor_Effect_Green[] =
        {0xbb,0xc0},\r
        SensorEnd\r
 };\r
+#if 0\r
 static struct rk_sensor_reg sensor_Effect_Grayscale[]=\r
 {\r
        {0x23,0x02},    \r
@@ -666,9 +667,11 @@ static struct rk_sensor_reg sensor_Effect_Grayscale[]=
        {0xb4,0x80},\r
        {0xba,0x00},\r
        {0xbb,0x00},\r
-       {0x00,0x00}\r
+       {0x00,0x00},\r
+       SensorEnd\r
+    \r
 };\r
-\r
+#endif\r
 static struct rk_sensor_reg *sensor_EffectSeqe[] = {sensor_Effect_Normal, sensor_Effect_WandB, sensor_Effect_Negative,sensor_Effect_Sepia,\r
        sensor_Effect_Bluish, sensor_Effect_Green,NULL,\r
 };\r
@@ -859,7 +862,7 @@ static struct sensor_v4l2ctrl_usr_s sensor_controls[] =
 static struct rk_sensor_datafmt sensor_colour_fmts[] = {\r
        {V4L2_MBUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_JPEG} \r
 };\r
-static struct soc_camera_ops sensor_ops;\r
+/*static struct soc_camera_ops sensor_ops;*/\r
 \r
 \r
 /*\r
@@ -1045,7 +1048,8 @@ static int sensor_focus_af_close_usr_cb(struct i2c_client *client){
        return 0;\r
 }\r
 \r
-static int sensor_focus_af_zoneupdate_usr_cb(struct i2c_client *client){\r
+static int sensor_focus_af_zoneupdate_usr_cb(struct i2c_client *client, int *zone_tm_pos)\r
+{\r
        return 0;\r
 }\r
 \r