td8801:camera:add sensor frame rate macro in board and set the front camera to mirror...

diff --git a/arch/arm/configs/rk29_td8801_v2_defconfig b/arch/arm/configs/rk29_td8801_v2_defconfig
index e1c6c869646bcc385d71e3fae362a0c9d66ad5a5..c87882b4354cf71088948442621c633bb2cfd26e 100755 (executable)
--- a/arch/arm/configs/rk29_td8801_v2_defconfig
+++ b/arch/arm/configs/rk29_td8801_v2_defconfig
@@ -1772,10 +1772,10 @@ CONFIG_SOC_CAMERA=y
 # CONFIG_SOC_CAMERA_OV9650 is not set
 # CONFIG_SOC_CAMERA_OV3640 is not set
 # CONFIG_SOC_CAMERA_OV5642 is not set
-CONFIG_SOC_CAMERA_OV5640=y
-CONFIG_OV5640_AUTOFOCUS=y
-# CONFIG_OV5640_FIXEDFOCUS is not set
-# CONFIG_SOC_CAMERA_OV5640_FOR_TD8801 is not set
+# CONFIG_SOC_CAMERA_OV5640 is not set
+CONFIG_SOC_CAMERA_OV5640_FOR_TD8801=y
+CONFIG_OV5640_AUTOFOCUS_FOR_TD8801=y
+# CONFIG_OV5640_FIXEDFOCUS_FOR_TD8801 is not set
 # CONFIG_SOC_CAMERA_S5K6AA is not set
 # CONFIG_SOC_CAMERA_GT2005 is not set
 # CONFIG_SOC_CAMERA_GC0307 is not set

diff --git a/arch/arm/mach-rk29/board-rk29-td8801_v2.c b/arch/arm/mach-rk29/board-rk29-td8801_v2.c
index 767e5607cb79536a24c91f7336e2728012a3da24..b31899b070535dff16ef1e1bcf382914f5b78b4f 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-td8801_v2.c
+++ b/arch/arm/mach-rk29/board-rk29-td8801_v2.c
@@ -98,9 +98,16 @@
 #define CONFIG_SENSOR_RESETACTIVE_LEVEL_0 RK29_CAM_RESETACTIVE_L
 #define CONFIG_SENSOR_POWERDNACTIVE_LEVEL_0 RK29_CAM_POWERDNACTIVE_H
 #define CONFIG_SENSOR_FLASHACTIVE_LEVEL_0 RK29_CAM_FLASHACTIVE_H
-
 #define CONFIG_SENSOR_TORCH_PIN_0         RK29_PIN4_PD1
 
+#define CONFIG_SENSOR_QCIF_FPS_FIXED_0      15
+#define CONFIG_SENSOR_QVGA_FPS_FIXED_0      15
+#define CONFIG_SENSOR_CIF_FPS_FIXED_0       15
+#define CONFIG_SENSOR_VGA_FPS_FIXED_0       15
+#define CONFIG_SENSOR_480P_FPS_FIXED_0      15
+#define CONFIG_SENSOR_SVGA_FPS_FIXED_0      15
+#define CONFIG_SENSOR_720P_FPS_FIXED_0      30
+
 
 #define CONFIG_SENSOR_1 RK29_CAM_SENSOR_GC0309                      /* front camera sensor */
 #define CONFIG_SENSOR_IIC_ADDR_1           0x42
@@ -114,9 +121,16 @@
 #define CONFIG_SENSOR_RESETACTIVE_LEVEL_1 RK29_CAM_RESETACTIVE_L
 #define CONFIG_SENSOR_POWERDNACTIVE_LEVEL_1 RK29_CAM_POWERDNACTIVE_H
 #define CONFIG_SENSOR_FLASHACTIVE_LEVEL_1 RK29_CAM_FLASHACTIVE_L
-
 #define CONFIG_SENSOR_TORCH_PIN_1         RK29_PIN4_PD1
 
+#define CONFIG_SENSOR_QCIF_FPS_FIXED_1      15
+#define CONFIG_SENSOR_QVGA_FPS_FIXED_1      15
+#define CONFIG_SENSOR_CIF_FPS_FIXED_1       15
+#define CONFIG_SENSOR_VGA_FPS_FIXED_1       15
+#define CONFIG_SENSOR_480P_FPS_FIXED_0      15
+#define CONFIG_SENSOR_SVGA_FPS_FIXED_0      15
+#define CONFIG_SENSOR_720P_FPS_FIXED_0      30
+
 #endif  //#ifdef CONFIG_VIDEO_RK29
 /*---------------- Camera Sensor Configuration Macro End------------------------*/
 #include "../../../drivers/media/video/rk29_camera.c"

diff --git a/drivers/media/video/gc0309_for_td8801.c b/drivers/media/video/gc0309_for_td8801.c
index b0aadbf63b965940969f9b4df4d08cd6e7ff0675..f23c4d81a15f5da75df334b0e0718c90c684d943 100644 (file)
--- a/drivers/media/video/gc0309_for_td8801.c
+++ b/drivers/media/video/gc0309_for_td8801.c
@@ -141,7 +141,7 @@ static struct reginfo sensor_init_data[] =
        {0x11,0x0d}, 
        {0x12,0x2a}, 
        {0x13,0x00}, 
-       {0x14,0x12},    
+       {0x14,0x13},
        {0x15,0x0a}, 
        {0x16,0x05}, 
        {0x17,0x01},