camera: all sensor driver(ov3640/ov9650 exception) can be compiled success in rk30...

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

diff --git a/drivers/media/video/sid130B.c b/drivers/media/video/sid130B.c
index 0827afef9d8dab89a3d3308529594908437e0c50..5bfbb0add50668a63dd0cbf18029035379d0408d 100755 (executable)
--- a/drivers/media/video/sid130B.c
+++ b/drivers/media/video/sid130B.c
@@ -19,7 +19,7 @@ o* Driver for MT9M001 CMOS Image Sensor from Micron
 #include <media/v4l2-common.h>\r
 #include <media/v4l2-chip-ident.h>\r
 #include <media/soc_camera.h>\r
-#include <mach/rk29_camera.h>\r
+#include <plat/rk_camera.h>\r
 \r
 static int debug;\r
 module_param(debug, int, S_IRUGO|S_IWUSR);\r
@@ -64,7 +64,7 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define CONFIG_SENSOR_DigitalZoom   0\r
 #define CONFIG_SENSOR_Focus         0\r
 #define CONFIG_SENSOR_Exposure      0\r
-#define CONFIG_SENSOR_Flash         0\r
+#define CONFIG_SENSOR_Flash         1\r
 #define CONFIG_SENSOR_Mirror        0\r
 #define CONFIG_SENSOR_Flip          0\r
 \r
@@ -1800,7 +1800,6 @@ static int sensor_init(struct v4l2_subdev *sd, u32 val)
        #endif\r
 \r
        #if CONFIG_SENSOR_Flash\r
-       sensor_set_flash();\r
        qctrl = soc_camera_find_qctrl(&sensor_ops, V4L2_CID_FLASH);\r
        if (qctrl)\r
         sensor->info_priv.flash = qctrl->default_value;\r
@@ -2049,7 +2048,7 @@ static int sensor_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
 \r
     if ((int)winseqe_set_addr  != sensor->info_priv.winseqe_cur_addr) {\r
         #if CONFIG_SENSOR_Flash\r
-        if (sensor_fmt_capturechk(sd,f) == true) {      /* ddl@rock-chips.com : Capture */\r
+        if (sensor_fmt_capturechk(sd,mf) == true) {      /* ddl@rock-chips.com : Capture */\r
             if ((sensor->info_priv.flash == 1) || (sensor->info_priv.flash == 2)) {\r
                 sensor_ioctrl(icd, Sensor_Flash, Flash_On);\r
                 SENSOR_DG("%s flash on in capture!\n", SENSOR_NAME_STRING());\r
@@ -2065,7 +2064,7 @@ static int sensor_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
         if (ret != 0) {\r
             SENSOR_TR("%s set format capability failed\n", SENSOR_NAME_STRING());\r
             #if CONFIG_SENSOR_Flash\r
-            if (sensor_fmt_capturechk(sd,f) == true) {\r
+            if (sensor_fmt_capturechk(sd,mf) == true) {\r
                 if ((sensor->info_priv.flash == 1) || (sensor->info_priv.flash == 2)) {\r
                     sensor_ioctrl(icd, Sensor_Flash, Flash_Off);\r
                     SENSOR_TR("%s Capture format set fail, flash off !\n", SENSOR_NAME_STRING());\r