Merge branch 'android-4.4' of https://android.googlesource.com/kernel/common

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

diff --git a/drivers/media/video/sp2518.c b/drivers/media/video/sp2518.c
index 3eb0b7fde3922be30247ffccb94ebe525ff04d63..a003f30f05fca19a4b219eca6ee523fb8377f805 100755 (executable)
--- a/drivers/media/video/sp2518.c
+++ b/drivers/media/video/sp2518.c
@@ -22,9 +22,9 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define SENSOR_NAME RK29_CAM_SENSOR_SP2518\r
 #define SENSOR_V4L2_IDENT V4L2_IDENT_SP2518\r
 #define SENSOR_ID 0x53\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                     800\r
 #define SENSOR_PREVIEW_H                     600\r
 #define SENSOR_PREVIEW_FPS                   15000     // 15fps \r
@@ -1053,7 +1053,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