camera: add support query 480p framerate

diff --git a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
index 4c17cb64c1ad550079491019e6f61dddac39aaf2..009ac46536f1762e5efd1e36f5a71d86a60bcdc7 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
+++ b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
@@ -85,6 +85,7 @@
 #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
 
@@ -105,6 +106,7 @@
 #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_1      15
 #define CONFIG_SENSOR_SVGA_FPS_FIXED_1      15
 #define CONFIG_SENSOR_720P_FPS_FIXED_1      30
 

diff --git a/drivers/media/video/rk29_camera.c b/drivers/media/video/rk29_camera.c
index 1c957a71687deb131717ff6714e6010fa94f0255..ecfca2e59ca341a6ec264de10c002d2e1db9bbe1 100755 (executable)
--- a/drivers/media/video/rk29_camera.c
+++ b/drivers/media/video/rk29_camera.c
@@ -1382,6 +1382,17 @@ static int rk29_sensor_io_init(void)
             j++;\r
             #endif\r
 \r
+            #if CONFIG_SENSOR_480P_FPS_FIXED_0\r
+            rk29_camera_platform_data.info[i].fival[j].discrete.denominator = CONFIG_SENSOR_480P_FPS_FIXED_0;\r
+            rk29_camera_platform_data.info[i].fival[j].discrete.numerator= 1;\r
+            rk29_camera_platform_data.info[i].fival[j].index = 0;\r
+            rk29_camera_platform_data.info[i].fival[j].pixel_format = V4L2_PIX_FMT_NV12;\r
+            rk29_camera_platform_data.info[i].fival[j].width = 720;\r
+            rk29_camera_platform_data.info[i].fival[j].height = 480;\r
+            rk29_camera_platform_data.info[i].fival[j].type = V4L2_FRMIVAL_TYPE_DISCRETE;\r
+            j++;\r
+            #endif            \r
+\r
             #if CONFIG_SENSOR_SVGA_FPS_FIXED_0\r
             rk29_camera_platform_data.info[i].fival[j].discrete.denominator = CONFIG_SENSOR_SVGA_FPS_FIXED_0;\r
             rk29_camera_platform_data.info[i].fival[j].discrete.numerator= 1;\r
@@ -1449,6 +1460,17 @@ static int rk29_sensor_io_init(void)
             j++;\r
             #endif\r
 \r
+            #if CONFIG_SENSOR_480P_FPS_FIXED_1\r
+            rk29_camera_platform_data.info[i].fival[j].discrete.denominator = CONFIG_SENSOR_480P_FPS_FIXED_1;\r
+            rk29_camera_platform_data.info[i].fival[j].discrete.numerator= 1;\r
+            rk29_camera_platform_data.info[i].fival[j].index = 0;\r
+            rk29_camera_platform_data.info[i].fival[j].pixel_format = V4L2_PIX_FMT_NV12;\r
+            rk29_camera_platform_data.info[i].fival[j].width = 720;\r
+            rk29_camera_platform_data.info[i].fival[j].height = 480;\r
+            rk29_camera_platform_data.info[i].fival[j].type = V4L2_FRMIVAL_TYPE_DISCRETE;\r
+            j++;\r
+            #endif \r
+\r
             #if CONFIG_SENSOR_SVGA_FPS_FIXED_1\r
             rk29_camera_platform_data.info[i].fival[j].discrete.denominator = CONFIG_SENSOR_SVGA_FPS_FIXED_1;\r
             rk29_camera_platform_data.info[i].fival[j].discrete.numerator= 1;\r