camera : gc0329/sp0838/s5k5ca commit again

diff --git a/arch/arm/plat-rk/include/plat/rk_camera.h b/arch/arm/plat-rk/include/plat/rk_camera.h
index 39f31b11facb4187c9085bbf495e26870168b28a..2a1dca105a2faf3be429e20cf3e0ec12a973d2ea 100755 (executable)
--- a/arch/arm/plat-rk/include/plat/rk_camera.h
+++ b/arch/arm/plat-rk/include/plat/rk_camera.h
@@ -65,6 +65,10 @@
 #define RK29_CAM_SENSOR_HI253  hi253
 #define RK29_CAM_SENSOR_HI704  hi704
 #define RK29_CAM_SENSOR_NT99250 nt99250
+#define RK29_CAM_SENSOR_SP0838  sp0838
+#define RK29_CAM_SENSOR_GC0329  gc0329
+#define RK29_CAM_SENSOR_S5K5CA  s5k5ca
+
 
 #define RK29_CAM_SENSOR_NAME_OV7675 "ov7675"
 #define RK29_CAM_SENSOR_NAME_OV9650 "ov9650"
@@ -92,6 +96,9 @@
 #define RK29_CAM_SENSOR_NAME_HI253  "hi253"
 #define RK29_CAM_SENSOR_NAME_HI704  "hi704"
 #define RK29_CAM_SENSOR_NAME_NT99250 "nt99250"
+#define RK29_CAM_SENSOR_NAME_SP0838  "sp0838"
+#define RK29_CAM_SENSOR_NAME_GC0329  "gc0329"
+#define RK29_CAM_SENSOR_NAME_S5K5CA  "s5k5ca"
 
 #define ov7675_FULL_RESOLUTION     0x30000            // 0.3 megapixel
 #define ov9650_FULL_RESOLUTION     0x130000           // 1.3 megapixel   
@@ -118,6 +125,9 @@
 #define hi253_FULL_RESOLUTION       0x200000           // 2 megapixel
 #define hi704_FULL_RESOLUTION       0x30000            // 0.3 megapixel
 #define nt99250_FULL_RESOLUTION     0x200000           // 2 megapixel
+#define sp0838_FULL_RESOLUTION      0x30000            // 0.3 megapixel
+#define gc0329_FULL_RESOLUTION      0x30000            // 0.3 megapixel
+#define s5k5ca_FULL_RESOLUTION      0x300000            // 3 megapixel
 /*---------------- Camera Sensor Must Define Macro End  ------------------------*/
 
 

diff --git a/drivers/media/video/gc0329.c b/drivers/media/video/gc0329.c
index 9db5a4190ca7f6b47f54bf2d0155c1a32ea6fb47..bc572997170130680c245fcb34bb0b2881223e8e 100755 (executable)
--- a/drivers/media/video/gc0329.c
+++ b/drivers/media/video/gc0329.c
@@ -20,7 +20,7 @@ o* Driver for MT9M001 CMOS Image Sensor from Micron
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/soc_camera.h>
-#include <mach/rk29_camera.h>
+#include <plat/rk_camera.h>
 
 static int debug;
 module_param(debug, int, S_IRUGO|S_IWUSR);

diff --git a/drivers/media/video/s5k5ca.c b/drivers/media/video/s5k5ca.c
index 0b3e431ca4d0c240657c00c4b1dc066894c1abec..dee10cd8e8eeae04ff445f4fa73546f6fc4751e3 100755 (executable)
--- a/drivers/media/video/s5k5ca.c
+++ b/drivers/media/video/s5k5ca.c
@@ -19,7 +19,7 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/soc_camera.h>
-#include <mach/rk29_camera.h>
+#include <plat/rk_camera.h>
 #include <mach/gpio.h>
 #include <linux/delay.h>
 #include "s5k5ca.h"

diff --git a/drivers/media/video/sp0838.c b/drivers/media/video/sp0838.c
index 0ec3dd7a40374a249d825ae1b41bd8c60f6e27dd..a828c2e527df997fc511b1be7e1717c6ca658355 100755 (executable)
--- a/drivers/media/video/sp0838.c
+++ b/drivers/media/video/sp0838.c
@@ -20,7 +20,7 @@ o* Driver for MT9M001 CMOS Image Sensor from Micron
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/soc_camera.h>
-#include <mach/rk29_camera.h>
+#include <plat/rk_camera.h>
 
 static int debug=1;
 module_param(debug, int, S_IRUGO|S_IWUSR);

diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index a27a50910a6c97386e100ec2f2e10678afc32bc2..8e69f2013d65f8269ea6ae02e72065b743686acb 100755 (executable)
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -90,6 +90,7 @@ enum {
 
        /* Samsung sensors: reserved range 310-319 */
        V4L2_IDENT_S5K66A = 310,                                                        /* ddl@rock-chips.com : s5k66a support */
+       V4L2_IDENT_S5K5CA = 311,                                                        /* ddl@rock-chips.com : s5k5ca support */
 
        /* Conexant MPEG encoder/decoders: reserved range 400-420 */
        V4L2_IDENT_CX23418_843 = 403, /* Integrated A/V Decoder on the '418 */
@@ -348,7 +349,10 @@ enum {
     V4L2_IDENT_HI704 = 64107,      /* ddl@rock-chips.com : hi704 support */
     V4L2_IDENT_NT99250 = 64108,    /* ddl@rock-chips.com : nt99250 support */
     V4L2_IDENT_SID130B = 64109,      /* ddl@rock-chips.com : sid130B support */
-    V4L2_IDENT_SIV121D= 64109,      /* ddl@rock-chips.com : sid130B support */
+    V4L2_IDENT_SP0838 = 64110,      /* ddl@rock-chips.com : SP0838 support */
+    V4L2_IDENT_GC0329 = 64111,      /* ddl@rock-chips.com : GC0329 support */
+
+    V4L2_IDENT_SIV121D= 64112,      /* ddl@rock-chips.com : sid130B support */
 
        /* Don't just add new IDs at the end: KEEP THIS LIST ORDERED BY ID! */
 };