ARM64: DTS: Add rk3399-firefly uart4 device, node as /dev/ttyS1

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

diff --git a/drivers/media/video/ov5640.c b/drivers/media/video/ov5640.c
index 2b684280c3029379f777a91832fd854f9ad40d98..7d5904001b5449dda688ed55385d49e0ed8303d6 100755 (executable)
--- a/drivers/media/video/ov5640.c
+++ b/drivers/media/video/ov5640.c
@@ -23,9 +23,9 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define SENSOR_NAME RK29_CAM_SENSOR_OV5640\r
 #define SENSOR_V4L2_IDENT V4L2_IDENT_OV5640\r
 #define SENSOR_ID 0x5640\r
-#define SENSOR_BUS_PARAM                                        (SOCAM_MASTER |\\r
-                                                                                        SOCAM_PCLK_SAMPLE_RISING|SOCAM_HSYNC_ACTIVE_HIGH| SOCAM_VSYNC_ACTIVE_LOW|\\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_LOW|\\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
@@ -983,7 +983,7 @@ static struct sensor_v4l2ctrl_usr_s sensor_controls[] =
 static struct rk_sensor_datafmt sensor_colour_fmts[] = {\r
        {V4L2_MBUS_FMT_UYVY8_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