camera: modify defines of some V4L2 macros

diff --git a/arch/arm/mach-rk3188/board-rk3188-icatch7002-camera.c b/arch/arm/mach-rk3188/board-rk3188-icatch7002-camera.c
index 34e382805abdf3406e4ba2b7f12d36ae7f10f1b4..9cb3e2eda3ce90150b220576bbf4244fa4ba188a 100755 (executable)
--- a/arch/arm/mach-rk3188/board-rk3188-icatch7002-camera.c
+++ b/arch/arm/mach-rk3188/board-rk3188-icatch7002-camera.c
@@ -210,7 +210,7 @@ static void rk_cif_power(struct rk29camera_gpio_res *res,int on)
                iomux_set(GPIO0_C0);
                gpio_set_value(RK30_PIN1_PA4,0);
                gpio_set_value(RK30_PIN1_PA5,0);
-               gpio_set_value(RK30_PIN1_PA6,0);        //Vincent_Liu@asus.com for clk 24M
+               gpio_set_value(RK30_PIN1_PA6,0);        // for clk 24M
                gpio_set_value(RK30_PIN1_PA7,0);
                gpio_set_value(RK30_PIN3_PB6,0);
                gpio_set_value(RK30_PIN3_PB7,0);

diff --git a/drivers/media/video/icatch7002/icatch7002_common.c b/drivers/media/video/icatch7002/icatch7002_common.c
index 0639212b12c21d103ef88bd3959f515b853bf371..aa2cb494e252c3c3c14d8fbbb4d2275c33a251c5 100755 (executable)
--- a/drivers/media/video/icatch7002/icatch7002_common.c
+++ b/drivers/media/video/icatch7002/icatch7002_common.c
@@ -2098,7 +2098,7 @@ void icatch_sensor_power_ctr(struct soc_camera_device *icd ,int on,int power_mod
                iomux_set(GPIO0_C0);
                gpio_set_value(RK30_PIN1_PA4,0);
                gpio_set_value(RK30_PIN1_PA5,0);
-               gpio_set_value(RK30_PIN1_PA6,0);        //Vincent_Liu@asus.com for clk 24M
+               gpio_set_value(RK30_PIN1_PA6,0);        // for clk 24M
                gpio_set_value(RK30_PIN1_PA7,0);
                gpio_set_value(RK30_PIN3_PB6,0);
                gpio_set_value(RK30_PIN3_PB7,0);
@@ -2106,7 +2106,7 @@ void icatch_sensor_power_ctr(struct soc_camera_device *icd ,int on,int power_mod
                //msleep(500);
        }else{
                //power ON
-               gpio_set_value(RK30_PIN1_PA6,1);        //Vincent_Liu@asus.com for clk 24M
+               gpio_set_value(RK30_PIN1_PA6,1);        // for clk 24M
                
                if(icl->power)
                        icl->power(icd->pdev,1);
@@ -2328,7 +2328,7 @@ void icatch_free_cali_fw_data(struct icatch_cali_fw_data * data) {
                 
                 icatch_sensor_power_ctr(icd,0,0);
                 icatch_sensor_power_ctr(icd,1,0);
-                gpio_set_value(RK30_PIN1_PA6,0);       //Vincent_Liu@asus.com for clk 24M
+                gpio_set_value(RK30_PIN1_PA6,0);       // for clk 24M
        #endif
        }
        // msleep(100);

diff --git a/drivers/media/video/rk30_camera_pingpong.c b/drivers/media/video/rk30_camera_pingpong.c
index 04eef257d075bc113be2dd72ac2321a7c11ef177..a5669ef193da49179402563f4d7f81f5245a58e7 100755 (executable)
--- a/drivers/media/video/rk30_camera_pingpong.c
+++ b/drivers/media/video/rk30_camera_pingpong.c
@@ -2037,7 +2037,6 @@ static int rk_camera_try_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
        }
     ret = soc_camera_bus_param_compatible(camera_flags, bus_flags) ;
 
-       /*nelson_yang@asus.com fix: rock-chip coding bug*/
        /* rockchip BUGBUG
                if (ret < 0)
                        dev_warn(icd->dev.parent,
@@ -2051,7 +2050,6 @@ static int rk_camera_try_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
        else{
                ret = 0;
        }
-       /*nelson_yang@asus.com fix: rock-chip coding bug end*/
     return ret;
 }
 

diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 7f001c4e68eb877966d9de14b1d08f1e2f80d1c3..9ca45cc7d5917390badd09321af760060ba33843 100644 (file)
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -1405,17 +1405,14 @@ enum  v4l2_exposure_auto_type {
 #define V4L2_CID_FOCUSZONE       (V4L2_CID_CAMERA_CLASS_BASE_ROCK+5)
 #define V4L2_CID_FACEDETECT (V4L2_CID_CAMERA_CLASS_BASE_ROCK+6)
 #define V4L2_CID_HDR        (V4L2_CID_CAMERA_CLASS_BASE_ROCK+7) 
-
-/* nelson_yang@asus.com : Add ioctrl - V4L2_CID_ISO for camera ISO control */
-#define V4L2_CID_CAMERA_CLASS_BASE_ASUS                (V4L2_CID_CAMERA_CLASS_BASE + 50)
-#define V4L2_CID_ISO                           (V4L2_CID_CAMERA_CLASS_BASE_ASUS + 1)
-#define V4L2_CID_ANTIBANDING           (V4L2_CID_CAMERA_CLASS_BASE_ASUS + 2)
-#define V4L2_CID_WHITEBALANCE_LOCK     (V4L2_CID_CAMERA_CLASS_BASE_ASUS + 3)
-#define V4L2_CID_EXPOSURE_LOCK         (V4L2_CID_CAMERA_CLASS_BASE_ASUS + 4)
-#define V4L2_CID_METERING_AREAS                (V4L2_CID_CAMERA_CLASS_BASE_ASUS + 5)
-#define V4L2_CID_WDR                           (V4L2_CID_CAMERA_CLASS_BASE_ASUS + 6)
-#define V4L2_CID_EDGE                          (V4L2_CID_CAMERA_CLASS_BASE_ASUS + 7)
-#define V4L2_CID_JPEG_EXIF                     (V4L2_CID_CAMERA_CLASS_BASE_ASUS + 8)
+#define V4L2_CID_ISO                           (V4L2_CID_CAMERA_CLASS_BASE_ROCK + 8)
+#define V4L2_CID_ANTIBANDING           (V4L2_CID_CAMERA_CLASS_BASE_ROCK + 9)
+#define V4L2_CID_WHITEBALANCE_LOCK     (V4L2_CID_CAMERA_CLASS_BASE_ROCK + 10)
+#define V4L2_CID_EXPOSURE_LOCK         (V4L2_CID_CAMERA_CLASS_BASE_ROCK + 11)
+#define V4L2_CID_METERING_AREAS                (V4L2_CID_CAMERA_CLASS_BASE_ROCK + 12)
+#define V4L2_CID_WDR                           (V4L2_CID_CAMERA_CLASS_BASE_ROCK + 13)
+#define V4L2_CID_EDGE                          (V4L2_CID_CAMERA_CLASS_BASE_ROCK + 14)
+#define V4L2_CID_JPEG_EXIF                     (V4L2_CID_CAMERA_CLASS_BASE_ROCK + 15)
 
 /* FM Modulator class control IDs */
 #define V4L2_CID_FM_TX_CLASS_BASE              (V4L2_CTRL_CLASS_FM_TX | 0x900)