camera: add support ov2640 sensor

diff --git a/arch/arm/mach-rk29/include/mach/rk29_camera.h b/arch/arm/mach-rk29/include/mach/rk29_camera.h
index 8dbc314b7bce0b1d57bb1e0ee1a1a3f0aa8b6e14..ad7ff796c007fd771484d0bd2263d855c44089d4 100644 (file)
--- a/arch/arm/mach-rk29/include/mach/rk29_camera.h
+++ b/arch/arm/mach-rk29/include/mach/rk29_camera.h
@@ -34,6 +34,7 @@
 
 #define RK29_CAM_SENSOR_OV7675 ov7675
 #define RK29_CAM_SENSOR_OV9650 ov9650
+#define RK29_CAM_SENSOR_OV2640 ov2640
 #define RK29_CAM_SENSOR_OV2655 ov2655
 #define RK29_CAM_SENSOR_OV2659 ov2659
 #define RK29_CAM_SENSOR_OV3640 ov3640
@@ -55,6 +56,7 @@
 
 #define RK29_CAM_SENSOR_NAME_OV7675 "ov7675"
 #define RK29_CAM_SENSOR_NAME_OV9650 "ov9650"
+#define RK29_CAM_SENSOR_NAME_OV2640 "ov2640"
 #define RK29_CAM_SENSOR_NAME_OV2655 "ov2655"
 #define RK29_CAM_SENSOR_NAME_OV2659 "ov2659"
 #define RK29_CAM_SENSOR_NAME_OV3640 "ov3640"

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 4c9e6344e2ed138f1919e2f4c641a258f2ebb720..fcead6b9902666861851ea13f7fee1b48da0d48e 100755 (executable)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -905,8 +905,12 @@ config SOC_CAMERA_OV9650
        tristate "ov9650 camera support"
        depends on SOC_CAMERA && I2C
        help
-         This is a ov2655 camera driver
-         
+         This is a ov9650 camera driver
+config SOC_CAMERA_OV2640
+       tristate "ov2640 camera support"
+       depends on SOC_CAMERA && I2C
+       help
+         This is a ov2640 camera driver          
 config SOC_CAMERA_OV3640
        tristate "ov3640 camera support"
        depends on SOC_CAMERA && I2C

diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index ff5d986bbded4bd8773cdd92536a505e30523447..a79cd7bcd81fa041535da8813431c575b0d6f6da 100755 (executable)
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -86,6 +86,7 @@ obj-$(CONFIG_SOC_CAMERA_OV7675)               += ov7675.o
 obj-$(CONFIG_SOC_CAMERA_OV2655)                += ov2655.o
 obj-$(CONFIG_SOC_CAMERA_OV2659)                += ov2659.o
 obj-$(CONFIG_SOC_CAMERA_OV9650)                += ov9650.o
+obj-$(CONFIG_SOC_CAMERA_OV2640)                += ov2640.o
 obj-$(CONFIG_SOC_CAMERA_OV3640)                += ov3640.o
 obj-$(CONFIG_SOC_CAMERA_OV5640)                += ov5640.o
 obj-$(CONFIG_SOC_CAMERA_OV5642)                += ov5642.o

diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index 64e8b17da990f728378d75971ee1989a62e15340..05dc2212cfab7d9fe00b0cbe1e5489f02f6b3ad0 100644 (file)
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -70,7 +70,7 @@ enum {
        V4L2_IDENT_OV5640 = 260,
        V4L2_IDENT_OV5642 = 261,
        V4L2_IDENT_OV7675 = 262,
-
+    V4L2_IDENT_OV2640 = 263,
        /* module saa7146: reserved range 300-309 */
        V4L2_IDENT_SAA7146 = 300,