camera: add svga fps info in rk_camera.c

diff --git a/arch/arm/plat-rk/rk_camera.c b/arch/arm/plat-rk/rk_camera.c
index 1a73ad4d48e5600ed56992a439d11da0f9730313..f57f49a7bcc5fe55c9c6d78bcd2f34b9af8e9cfd 100755 (executable)
--- a/arch/arm/plat-rk/rk_camera.c
+++ b/arch/arm/plat-rk/rk_camera.c
@@ -846,6 +846,8 @@ static void rk29_sensor_fps_get(int idx, unsigned int *val, int w, int h)
                 *val = CONFIG_SENSOR_VGA_FPS_FIXED_0;\r
             } else if ((w==720) && (h==480)) {\r
                 *val = CONFIG_SENSOR_480P_FPS_FIXED_0;\r
+            } else if ((w==800) && (h==600)) {\r
+                *val = CONFIG_SENSOR_SVGA_FPS_FIXED_0;\r
             } else if ((w==1280) && (h==720)) {\r
                 *val = CONFIG_SENSOR_720P_FPS_FIXED_0;\r
             }\r
@@ -867,6 +869,8 @@ static void rk29_sensor_fps_get(int idx, unsigned int *val, int w, int h)
                 *val = CONFIG_SENSOR_VGA_FPS_FIXED_1;\r
             } else if ((w==720) && (h==480)) {\r
                 *val = CONFIG_SENSOR_480P_FPS_FIXED_1;\r
+            } else if ((w==800) && (h==600)) {\r
+                *val = CONFIG_SENSOR_SVGA_FPS_FIXED_1;\r
             } else if ((w==1280) && (h==720)) {\r
                 *val = CONFIG_SENSOR_720P_FPS_FIXED_1;\r
             }\r
@@ -890,6 +894,8 @@ static void rk29_sensor_fps_get(int idx, unsigned int *val, int w, int h)
                 *val = CONFIG_SENSOR_VGA_FPS_FIXED_01;\r
             } else if ((w==720) && (h==480)) {\r
                 *val = CONFIG_SENSOR_480P_FPS_FIXED_01;\r
+            } else if ((w==800) && (h==600)) {\r
+                *val = CONFIG_SENSOR_SVGA_FPS_FIXED_01;\r
             } else if ((w==1280) && (h==720)) {\r
                 *val = CONFIG_SENSOR_720P_FPS_FIXED_01;\r
             }\r
@@ -913,6 +919,8 @@ static void rk29_sensor_fps_get(int idx, unsigned int *val, int w, int h)
                 *val = CONFIG_SENSOR_VGA_FPS_FIXED_02;\r
             } else if ((w==720) && (h==480)) {\r
                 *val = CONFIG_SENSOR_480P_FPS_FIXED_02;\r
+            } else if ((w==800) && (h==600)) {\r
+                *val = CONFIG_SENSOR_SVGA_FPS_FIXED_02;\r
             } else if ((w==1280) && (h==720)) {\r
                 *val = CONFIG_SENSOR_720P_FPS_FIXED_02;\r
             }\r
@@ -937,6 +945,8 @@ static void rk29_sensor_fps_get(int idx, unsigned int *val, int w, int h)
                 *val = CONFIG_SENSOR_VGA_FPS_FIXED_11;\r
             } else if ((w==720) && (h==480)) {\r
                 *val = CONFIG_SENSOR_480P_FPS_FIXED_11;\r
+            } else if ((w==800) && (h==600)) {\r
+                *val = CONFIG_SENSOR_SVGA_FPS_FIXED_11;\r
             } else if ((w==1280) && (h==720)) {\r
                 *val = CONFIG_SENSOR_720P_FPS_FIXED_11;\r
             }\r
@@ -960,6 +970,8 @@ static void rk29_sensor_fps_get(int idx, unsigned int *val, int w, int h)
                 *val = CONFIG_SENSOR_VGA_FPS_FIXED_12;\r
             } else if ((w==720) && (h==480)) {\r
                 *val = CONFIG_SENSOR_480P_FPS_FIXED_12;\r
+            } else if ((w==800) && (h==600)) {\r
+                *val = CONFIG_SENSOR_SVGA_FPS_FIXED_12;\r
             } else if ((w==1280) && (h==720)) {\r
                 *val = CONFIG_SENSOR_720P_FPS_FIXED_12;\r
             }\r
@@ -1145,7 +1157,10 @@ static int rk_sensor_io_init(void)
             } else if (j==6) {\r
                 plat_data->info[i].fival[j].width = 240;\r
                 plat_data->info[i].fival[j].height = 160;\r
-            }\r
+            } else if (j==7) {\r
+                plat_data->info[i].fival[j].width = 800;\r
+                plat_data->info[i].fival[j].height = 600;\r
+            } \r
             if (plat_data->info[i].fival[j].width && plat_data->info[i].fival[j].height) {\r
                 rk29_sensor_fps_get(i,&plat_data->info[i].fival[j].discrete.denominator,\r
                     plat_data->info[i].fival[j].width,plat_data->info[i].fival[j].height);\r