camera: fix ov7675/sid130B sensor macro error

diff --git a/arch/arm/mach-rk29/include/mach/rk29_camera.h b/arch/arm/mach-rk29/include/mach/rk29_camera.h
index 608119542b37811183cdffc50d6fd6957035a719..8dbc314b7bce0b1d57bb1e0ee1a1a3f0aa8b6e14 100644 (file)
--- a/arch/arm/mach-rk29/include/mach/rk29_camera.h
+++ b/arch/arm/mach-rk29/include/mach/rk29_camera.h
@@ -48,9 +48,10 @@
 #define RK29_CAM_SENSOR_GC0309  gc0309
 #define RK29_CAM_SENSOR_GC2015  gc2015
 #define RK29_CAM_SENSOR_SIV120B  siv120b
-#define RK29_CAM_SENSOR_SID130B  sid120B
+#define RK29_CAM_SENSOR_SID130B  sid130B
 #define RK29_CAM_SENSOR_HI253  hi253
 #define RK29_CAM_SENSOR_HI704  hi704
+#define RK29_CAM_SENSOR_NT99250 nt99250
 
 #define RK29_CAM_SENSOR_NAME_OV7675 "ov7675"
 #define RK29_CAM_SENSOR_NAME_OV9650 "ov9650"
@@ -68,9 +69,10 @@
 #define RK29_CAM_SENSOR_NAME_GC0309  "gc0309"
 #define RK29_CAM_SENSOR_NAME_GC2015  "gc2015"
 #define RK29_CAM_SENSOR_NAME_SIV120B "siv120b"
-#define RK29_CAM_SENSOR_NAME_SID130B "sid120B"
+#define RK29_CAM_SENSOR_NAME_SID130B "sid130B"
 #define RK29_CAM_SENSOR_NAME_HI253  "hi253"
 #define RK29_CAM_SENSOR_NAME_HI704  "hi704"
+#define RK29_CAM_SENSOR_NAME_NT99250 "nt99250"
 
 #define RK29_CAM_POWERACTIVE_BITPOS    0x00
 #define RK29_CAM_POWERACTIVE_MASK      (1<<RK29_CAM_POWERACTIVE_BITPOS)

diff --git a/drivers/media/video/ov7675.c b/drivers/media/video/ov7675.c
index 84788a9eb985f717528265f339c7e679fd3f168d..c9a427147d1ca0582a7286ad3116b19ad51ce7f5 100755 (executable)
--- a/drivers/media/video/ov7675.c
+++ b/drivers/media/video/ov7675.c
@@ -44,7 +44,7 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define MAX(x,y)    ((x>y) ? x: y)
 
 /* Sensor Driver Configuration */
-#define SENSOR_NAME ov7675
+#define SENSOR_NAME RK29_CAM_SENSOR_OV7675
 #define SENSOR_V4L2_IDENT V4L2_IDENT_OV7675
 #define SENSOR_ID 0x76
 #define SENSOR_MIN_WIDTH    640//176

diff --git a/drivers/media/video/sid130B.c b/drivers/media/video/sid130B.c
index 0b43cdd299e69fbe7a4dbd72ad5af71892682207..3bd9085270145abc5240bad87f023b7a0e5540bb 100755 (executable)
--- a/drivers/media/video/sid130B.c
+++ b/drivers/media/video/sid130B.c
@@ -44,7 +44,7 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 \r
 /* Sensor Driver Configuration */\r
 #define SENSOR_NAME sid130B\r
-#define SENSOR_V4L2_IDENT V4L2_IDENT_OV2655\r
+#define SENSOR_V4L2_IDENT V4L2_IDENT_SID130B\r
 #define SENSOR_ID 0x1B\r
 #define SENSOR_MIN_WIDTH    176\r
 #define SENSOR_MIN_HEIGHT   144\r

diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index a397b5154cdb55efb7e16d58453ffc1a95f2ae0e..64e8b17da990f728378d75971ee1989a62e15340 100644 (file)
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -282,12 +282,13 @@ enum {
     V4L2_IDENT_GT2005 = 64100,       /* ddl@rock-chips.com : GT2005 support */
     V4L2_IDENT_GC0308 = 64101,      /* ddl@rock-chips.com : GC0308 support */
     V4L2_IDENT_GC0309 = 64102,      /* ddl@rock-chips.com : GC0309 support */
-    V4L2_IDENT_SIV120B = 64103,      /* ddl@rock-chips.com : siv120b support */
-
+    V4L2_IDENT_SIV120B = 64103,      /* ddl@rock-chips.com : siv120b support */    
+    
     V4L2_IDENT_GC2015 = 64105,      /* ddl@rock-chips.com : gc2015 support */
     V4L2_IDENT_HI253 = 64106,      /* ddl@rock-chips.com : hi253 support */
     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 */
     
 };