camera: camera io code is compatible for rk29 and rk30
authorddl <ddl@rock-chips.com>
Tue, 27 Mar 2012 09:54:38 +0000 (17:54 +0800)
committerddl <ddl@rock-chips.com>
Tue, 27 Mar 2012 09:55:05 +0000 (17:55 +0800)
arch/arm/mach-rk29/include/mach/rk29_camera.h
arch/arm/mach-rk30/include/mach/rk30_camera.h [new file with mode: 0755]
arch/arm/plat-rk/include/plat/rk_camera.h
arch/arm/plat-rk/rk_camera.c [new file with mode: 0755]
drivers/media/video/Kconfig
drivers/media/video/rk29_camera.c
drivers/media/video/rk29_camera_oneframe.c
drivers/media/video/rk30_camera.c
drivers/media/video/rk30_camera_oneframe.c

index c1cbc3289921e3989192f5f394a778f0a8363ba9..66c9f68b5b6068ace8ebdf58aad2f16a13d37cd6 100755 (executable)
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
+#ifndef __ASM_ARCH_CAMERA_RK29_H_
 
-#ifndef __ASM_ARCH_CAMERA_H_
-#define __ASM_ARCH_CAMERA_H_
+#define __ASM_ARCH_CAMERA_RK29_H_
+#define RK29_CAM_DRV_NAME "rk-camera-rk29"
 
-#include <linux/videodev2.h>
-
-#define RK29_CAM_DRV_NAME "rk29xx-camera"
-#define RK29_CAM_PLATFORM_DEV_ID 33
-
-#define INVALID_GPIO -1
-
-#define RK29_CAM_IO_SUCCESS 0
-#define RK29_CAM_EIO_INVALID -1
-#define RK29_CAM_EIO_REQUESTFAIL -2
-
-#define RK29_CAM_SUPPORT_NUMS   6
-
-/*---------------- Camera Sensor Must Define Macro Begin  ------------------------*/
-#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_OV7690 ov7690
-#define RK29_CAM_SENSOR_OV3640 ov3640
-#define RK29_CAM_SENSOR_OV5640 ov5640
-#define RK29_CAM_SENSOR_OV5642 ov5642
-#define RK29_CAM_SENSOR_S5K6AA s5k6aa
-#define RK29_CAM_SENSOR_MT9D112 mt9d112
-#define RK29_CAM_SENSOR_MT9D113 mt9d113
-#define RK29_CAM_SENSOR_MT9P111 mt9p111
-#define RK29_CAM_SENSOR_MT9T111 mt9t111
-#define RK29_CAM_SENSOR_GT2005  gt2005
-#define RK29_CAM_SENSOR_GC0307  gc0307
-#define RK29_CAM_SENSOR_GC0308  gc0308
-#define RK29_CAM_SENSOR_GC0309  gc0309
-#define RK29_CAM_SENSOR_GC2015  gc2015
-#define RK29_CAM_SENSOR_SIV120B  siv120b
-#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"
-#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_OV7690 "ov7690"
-#define RK29_CAM_SENSOR_NAME_OV3640 "ov3640"
-#define RK29_CAM_SENSOR_NAME_OV5640 "ov5640"
-#define RK29_CAM_SENSOR_NAME_OV5642 "ov5642"
-#define RK29_CAM_SENSOR_NAME_S5K6AA "s5k6aa"
-#define RK29_CAM_SENSOR_NAME_MT9D112 "mt9d112"
-#define RK29_CAM_SENSOR_NAME_MT9D113 "mt9d113"
-#define RK29_CAM_SENSOR_NAME_MT9P111 "mt9p111"
-#define RK29_CAM_SENSOR_NAME_MT9T111 "mt9t111"
-#define RK29_CAM_SENSOR_NAME_GT2005  "gt2005"
-#define RK29_CAM_SENSOR_NAME_GC0307  "gc0307"
-#define RK29_CAM_SENSOR_NAME_GC0308  "gc0308"
-#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 "sid130B"
-#define RK29_CAM_SENSOR_NAME_HI253  "hi253"
-#define RK29_CAM_SENSOR_NAME_HI704  "hi704"
-#define RK29_CAM_SENSOR_NAME_NT99250 "nt99250"
-
-#define ov7675_FULL_RESOLUTION     0x30000            // 0.3 megapixel
-#define ov9650_FULL_RESOLUTION     0x130000           // 1.3 megapixel   
-#define ov2640_FULL_RESOLUTION     0x200000           // 2 megapixel
-#define ov2655_FULL_RESOLUTION     0x200000           // 2 megapixel
-#define ov2659_FULL_RESOLUTION     0x200000           // 2 megapixel
-#define ov7690_FULL_RESOLUTION     0x300000           // 2 megapixel
-#define ov3640_FULL_RESOLUTION     0x300000           // 3 megapixel
-#define ov5640_FULL_RESOLUTION     0x500000           // 5 megapixel
-#define ov5642_FULL_RESOLUTION     0x500000           // 5 megapixel
-#define s5k6aa_FULL_RESOLUTION     0x130000           // 1.3 megapixel
-#define mt9d112_FULL_RESOLUTION    0x200000           // 2 megapixel
-#define mt9d113_FULL_RESOLUTION    0x200000           // 2 megapixel
-#define mt9t111_FULL_RESOLUTION    0x300000           // 3 megapixel
-#define mt9p111_FULL_RESOLUTION    0x500000           // 5 megapixel
-#define gt2005_FULL_RESOLUTION     0x200000           // 2 megapixel
-#define gc0308_FULL_RESOLUTION     0x30000            // 0.3 megapixel
-#define gc0309_FULL_RESOLUTION     0x30000            // 0.3 megapixel
-#define gc2015_FULL_RESOLUTION     0x200000           // 2 megapixel
-#define siv120b_FULL_RESOLUTION     0x30000            // 0.3 megapixel
-#define sid130B_FULL_RESOLUTION     0x200000           // 2 megapixel    
-#define hi253_FULL_RESOLUTION       0x200000           // 2 megapixel
-#define hi704_FULL_RESOLUTION       0x30000            // 0.3 megapixel
-#define nt99250_FULL_RESOLUTION     0x200000           // 2 megapixel
-/*---------------- Camera Sensor Must Define Macro End  ------------------------*/
-
-
-#define RK29_CAM_POWERACTIVE_BITPOS    0x00
-#define RK29_CAM_POWERACTIVE_MASK      (1<<RK29_CAM_POWERACTIVE_BITPOS)
-#define RK29_CAM_POWERACTIVE_H (0x01<<RK29_CAM_POWERACTIVE_BITPOS)
-#define RK29_CAM_POWERACTIVE_L (0x00<<RK29_CAM_POWERACTIVE_BITPOS)
-
-#define RK29_CAM_RESETACTIVE_BITPOS    0x01
-#define RK29_CAM_RESETACTIVE_MASK      (1<<RK29_CAM_RESETACTIVE_BITPOS)
-#define RK29_CAM_RESETACTIVE_H (0x01<<RK29_CAM_RESETACTIVE_BITPOS)
-#define RK29_CAM_RESETACTIVE_L  (0x00<<RK29_CAM_RESETACTIVE_BITPOS)
-
-#define RK29_CAM_POWERDNACTIVE_BITPOS  0x02
-#define RK29_CAM_POWERDNACTIVE_MASK    (1<<RK29_CAM_POWERDNACTIVE_BITPOS)
-#define RK29_CAM_POWERDNACTIVE_H       (0x01<<RK29_CAM_POWERDNACTIVE_BITPOS)
-#define RK29_CAM_POWERDNACTIVE_L       (0x00<<RK29_CAM_POWERDNACTIVE_BITPOS)
-
-#define RK29_CAM_FLASHACTIVE_BITPOS    0x03
-#define RK29_CAM_FLASHACTIVE_MASK      (1<<RK29_CAM_FLASHACTIVE_BITPOS)
-#define RK29_CAM_FLASHACTIVE_H (0x01<<RK29_CAM_FLASHACTIVE_BITPOS)
-#define RK29_CAM_FLASHACTIVE_L  (0x00<<RK29_CAM_FLASHACTIVE_BITPOS)
-
-/* v4l2_subdev_core_ops.ioctl  ioctl_cmd macro */
-#define RK29_CAM_SUBDEV_ACTIVATE            0x00
-#define RK29_CAM_SUBDEV_DEACTIVATE          0x01
-#define RK29_CAM_SUBDEV_IOREQUEST                      0x02
-#define RK29_CAM_SUBDEV_CB_REGISTER         0x03
-
-enum rk29camera_ioctrl_cmd
-{
-       Cam_Power,
-       Cam_Reset,
-       Cam_PowerDown,
-       Cam_Flash
-};
-
-enum rk29sensor_power_cmd
-{
-       Sensor_Reset,
-       Sensor_PowerDown,
-       Sensor_Flash
-};
-
-enum rk29camera_flash_cmd
-{
-    Flash_Off,
-    Flash_On,
-    Flash_Torch
-};
-
-struct rk29camera_gpio_res {
-    unsigned int gpio_reset;
-    unsigned int gpio_power;
-       unsigned int gpio_powerdown;
-       unsigned int gpio_flash;
-    unsigned int gpio_flag;
-       unsigned int gpio_init;
-    
-    const char *dev_name;
-};
-
-struct rk29camera_mem_res {
-       const char *name;
-       unsigned int start;
-       unsigned int size;
-};
-struct rk29camera_info {
-    const char *dev_name;
-    unsigned int orientation;
-    struct v4l2_frmivalenum fival[10];
-};
-struct rk29camera_platform_data {
-    int (*io_init)(void);
-    int (*io_deinit)(int sensor);
-       int (*sensor_ioctrl)(struct device *dev,enum rk29camera_ioctrl_cmd cmd,int on);
-    struct rk29camera_gpio_res gpio_res[RK29_CAM_SUPPORT_NUMS];
-       struct rk29camera_mem_res meminfo;
-    struct rk29camera_info info[RK29_CAM_SUPPORT_NUMS];
-};
-
-struct rk29camera_platform_ioctl_cb {
-    int (*sensor_power_cb)(struct rk29camera_gpio_res *res, int on);
-    int (*sensor_reset_cb)(struct rk29camera_gpio_res *res, int on);
-    int (*sensor_powerdown_cb)(struct rk29camera_gpio_res *res, int on);
-    int (*sensor_flash_cb)(struct rk29camera_gpio_res *res, int on);    
-};
-
-typedef struct rk29_camera_sensor_cb {
-    int (*sensor_cb)(void *arg); 
-}rk29_camera_sensor_cb_s;
-
-#endif /* __ASM_ARCH_CAMERA_H_ */
+#include <plat/rk_camera.h>
 
+#endif
diff --git a/arch/arm/mach-rk30/include/mach/rk30_camera.h b/arch/arm/mach-rk30/include/mach/rk30_camera.h
new file mode 100755 (executable)
index 0000000..5365fab
--- /dev/null
@@ -0,0 +1,29 @@
+/*
+    camera.h - PXA camera driver header file
+
+    Copyright (C) 2003, Intel Corporation
+    Copyright (C) 2008, Guennadi Liakhovetski <kernel@pengutronix.de>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#ifndef __ASM_ARCH_CAMERA_RK30_H_\r
+
+#define __ASM_ARCH_CAMERA_RK29_H_
+#define RK29_CAM_DRV_NAME "rk-camera-rk30"\r
+
+#include <plat/rk_camera.h>
+
+#endif\r
+\r
index d6cabc46b94f806b06ae910e5847c9cd343af9ad..8f8786e32b693ee1fb8f6a7b299a1bf77b70e62b 100755 (executable)
@@ -24,7 +24,8 @@
 
 #include <linux/videodev2.h>
 #include <media/soc_camera.h>
-#define RK29_CAM_DRV_NAME "rk30xx-camera"
+
+
 #define RK29_CAM_PLATFORM_DEV_ID 33
 #define RK_CAM_PLATFORM_DEV_ID_0 RK29_CAM_PLATFORM_DEV_ID
 #define RK_CAM_PLATFORM_DEV_ID_1 (RK_CAM_PLATFORM_DEV_ID_0+1)
@@ -34,7 +35,9 @@
 #define RK29_CAM_EIO_INVALID -1
 #define RK29_CAM_EIO_REQUESTFAIL -2
 
-#define RK_CAM_NUM 2
+#define RK_CAM_NUM 6
+#define RK29_CAM_SUPPORT_NUMS  RK_CAM_NUM
+#define RK_CAM_SUPPORT_RESOLUTION 0x500000
 /*---------------- Camera Sensor Must Define Macro Begin  ------------------------*/
 #define RK29_CAM_SENSOR_OV7675 ov7675
 #define RK29_CAM_SENSOR_OV9650 ov9650
@@ -197,15 +200,24 @@ typedef struct rk_sensor_user_init_data{
        int rk_sensor_winseq_size;
        struct reginfo_t * rk_sensor_init_winseq;
 }rk_sensor_user_init_data_s;
+
+typedef struct rk_camera_device_register_info {
+    struct i2c_board_info i2c_cam_info;
+    struct soc_camera_link link_info;
+    struct platform_device device_info;
+}rk_camera_device_register_info_t;
+
 struct rk29camera_platform_data {
     int (*io_init)(void);
     int (*io_deinit)(int sensor);
+    int (*iomux)(int pin);
        int (*sensor_ioctrl)(struct device *dev,enum rk29camera_ioctrl_cmd cmd,int on);
        rk_sensor_user_init_data_s* sensor_init_data[RK_CAM_NUM];
        struct rk29camera_gpio_res gpio_res[RK_CAM_NUM];
        struct rk29camera_mem_res meminfo;
        struct rk29camera_mem_res meminfo_cif1;
        struct rk29camera_info info[RK_CAM_NUM];
+    rk_camera_device_register_info_t register_dev[RK_CAM_NUM];
 };
 
 struct rk29camera_platform_ioctl_cb {
@@ -218,7 +230,5 @@ struct rk29camera_platform_ioctl_cb {
 typedef struct rk29_camera_sensor_cb {
     int (*sensor_cb)(void *arg); 
 }rk29_camera_sensor_cb_s;
-
-
 #endif /* __ASM_ARCH_CAMERA_H_ */
 
diff --git a/arch/arm/plat-rk/rk_camera.c b/arch/arm/plat-rk/rk_camera.c
new file mode 100755 (executable)
index 0000000..625e6c0
--- /dev/null
@@ -0,0 +1,1301 @@
+#include <plat/rk_camera.h> \r
+\r
+#ifndef PMEM_CAM_SIZE\r
+#ifdef CONFIG_VIDEO_RK29 \r
+/*---------------- Camera Sensor Fixed Macro Begin  ------------------------*/\r
+// Below Macro is fixed, programer don't change it!!!!!!\r
+#define _CONS(a,b) a##b\r
+#define CONS(a,b) _CONS(a,b)\r
+\r
+#define __STR(x) #x\r
+#define _STR(x) __STR(x)\r
+#define STR(x) _STR(x)\r
+\r
+#if (CONFIG_SENSOR_IIC_ADDR_0 != 0x00)\r
+#define PMEM_SENSOR_FULL_RESOLUTION_0  CONS(CONFIG_SENSOR_0,_FULL_RESOLUTION)\r
+\r
+    #ifdef CONFIG_SENSOR_CIF_INDEX_0\r
+    #define SENSOR_CIF_BUSID_0             CONS(RK_CAM_PLATFORM_DEV_ID_,CONFIG_SENSOR_CIF_INDEX_0)\r
+    #else\r
+    #define SENSOR_CIF_BUSID_0             RK29_CAM_PLATFORM_DEV_ID\r
+    #endif\r
+    \r
+    #if !(PMEM_SENSOR_FULL_RESOLUTION_0)\r
+    #undef PMEM_SENSOR_FULL_RESOLUTION_0\r
+    #define PMEM_SENSOR_FULL_RESOLUTION_0  RK_CAM_SUPPORT_RESOLUTION\r
+    #endif\r
+    \r
+    #if(SENSOR_CIF_BUSID_0 == RK_CAM_PLATFORM_DEV_ID_0)\r
+    #define PMEM_SENSOR_FULL_RESOLUTION_CIF_0 PMEM_SENSOR_FULL_RESOLUTION_0\r
+    #define PMEM_SENSOR_FULL_RESOLUTION_CIF_1 0\r
+    #else\r
+    #define PMEM_SENSOR_FULL_RESOLUTION_CIF_1 PMEM_SENSOR_FULL_RESOLUTION_0\r
+    #define PMEM_SENSOR_FULL_RESOLUTION_CIF_0 0\r
+    #endif\r
+#else\r
+#define PMEM_SENSOR_FULL_RESOLUTION_CIF_0 0x00\r
+#define PMEM_SENSOR_FULL_RESOLUTION_CIF_1 0x00\r
+#endif\r
\r
+#if (CONFIG_SENSOR_IIC_ADDR_1 != 0x00)\r
+#define PMEM_SENSOR_FULL_RESOLUTION_1  CONS(CONFIG_SENSOR_1,_FULL_RESOLUTION)\r
+\r
+    #ifdef CONFIG_SENSOR_CIF_INDEX_1\r
+    #define SENSOR_CIF_BUSID_1             CONS(RK_CAM_PLATFORM_DEV_ID_,CONFIG_SENSOR_CIF_INDEX_1)\r
+    #else\r
+    #define SENSOR_CIF_BUSID_1             RK29_CAM_PLATFORM_DEV_ID\r
+    #endif\r
+    \r
+    #if !(PMEM_SENSOR_FULL_RESOLUTION_1)\r
+    #undef PMEM_SENSOR_FULL_RESOLUTION_1\r
+    #define PMEM_SENSOR_FULL_RESOLUTION_1  RK_CAM_SUPPORT_RESOLUTION\r
+    #endif\r
+    #if (SENSOR_CIF_BUSID_1 == RK_CAM_PLATFORM_DEV_ID_0)\r
+          #if (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 < PMEM_SENSOR_FULL_RESOLUTION_1)\r
+          #undef PMEM_SENSOR_FULL_RESOLUTION_CIF_0\r
+          #define PMEM_SENSOR_FULL_RESOLUTION_CIF_0 PMEM_SENSOR_FULL_RESOLUTION_1\r
+          #endif\r
+    #else\r
+          #if (PMEM_SENSOR_FULL_RESOLUTION_CIF_1 < PMEM_SENSOR_FULL_RESOLUTION_1)\r
+          #undef PMEM_SENSOR_FULL_RESOLUTION_CIF_1\r
+          #define PMEM_SENSOR_FULL_RESOLUTION_CIF_1 PMEM_SENSOR_FULL_RESOLUTION_1\r
+          #endif\r
+    #endif\r
+#endif\r
+\r
+#ifdef CONFIG_SENSOR_IIC_ADDR_01\r
+#if (CONFIG_SENSOR_IIC_ADDR_01 != 0x00)\r
+#define PMEM_SENSOR_FULL_RESOLUTION_01  CONS(CONFIG_SENSOR_02,_FULL_RESOLUTION)\r
+\r
+    #ifdef CONFIG_SENSOR_CIF_INDEX_01\r
+    #define SENSOR_CIF_BUSID_01             CONS(RK_CAM_PLATFORM_DEV_ID_,CONFIG_SENSOR_CIF_INDEX_01)\r
+    #else\r
+    #define SENSOR_CIF_BUSID_01             RK29_CAM_PLATFORM_DEV_ID\r
+    #endif\r
+    \r
+    #if !(PMEM_SENSOR_FULL_RESOLUTION_01)\r
+    #undef PMEM_SENSOR_FULL_RESOLUTION_01\r
+    #define PMEM_SENSOR_FULL_RESOLUTION_01  RK_CAM_SUPPORT_RESOLUTION\r
+    #endif\r
+    #if (SENSOR_CIF_BUSID_01 == RK_CAM_PLATFORM_DEV_ID_0)\r
+          #if (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 < PMEM_SENSOR_FULL_RESOLUTION_01)\r
+          #undef PMEM_SENSOR_FULL_RESOLUTION_CIF_0\r
+          #define PMEM_SENSOR_FULL_RESOLUTION_CIF_0 PMEM_SENSOR_FULL_RESOLUTION_01\r
+          #endif\r
+    #else\r
+          #if (PMEM_SENSOR_FULL_RESOLUTION_CIF_1 < PMEM_SENSOR_FULL_RESOLUTION_01)\r
+          #undef PMEM_SENSOR_FULL_RESOLUTION_CIF_1\r
+          #define PMEM_SENSOR_FULL_RESOLUTION_CIF_1 PMEM_SENSOR_FULL_RESOLUTION_01\r
+          #endif\r
+    #endif\r
+#endif\r
+#endif\r
+\r
+#ifdef CONFIG_SENSOR_IIC_ADDR_02\r
+#if (CONFIG_SENSOR_IIC_ADDR_02 != 0x00)\r
+#define PMEM_SENSOR_FULL_RESOLUTION_02  CONS(CONFIG_SENSOR_02,_FULL_RESOLUTION)\r
+\r
+    #ifdef CONFIG_SENSOR_CIF_INDEX_02\r
+    #define SENSOR_CIF_BUSID_02             CONS(RK_CAM_PLATFORM_DEV_ID_,CONFIG_SENSOR_CIF_INDEX_02)\r
+    #else\r
+    #define SENSOR_CIF_BUSID_02             RK29_CAM_PLATFORM_DEV_ID\r
+    #endif\r
+    \r
+    #if !(PMEM_SENSOR_FULL_RESOLUTION_02)\r
+    #undef PMEM_SENSOR_FULL_RESOLUTION_02\r
+    #define PMEM_SENSOR_FULL_RESOLUTION_02  RK_CAM_SUPPORT_RESOLUTION\r
+    #endif\r
+    #if (SENSOR_CIF_BUSID_02 == RK_CAM_PLATFORM_DEV_ID_0)\r
+          #if (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 < PMEM_SENSOR_FULL_RESOLUTION_02)\r
+          #undef PMEM_SENSOR_FULL_RESOLUTION_CIF_0\r
+          #define PMEM_SENSOR_FULL_RESOLUTION_CIF_0 PMEM_SENSOR_FULL_RESOLUTION_02\r
+          #endif\r
+    #else\r
+          #if (PMEM_SENSOR_FULL_RESOLUTION_CIF_1 < PMEM_SENSOR_FULL_RESOLUTION_02)\r
+          #undef PMEM_SENSOR_FULL_RESOLUTION_CIF_1\r
+          #define PMEM_SENSOR_FULL_RESOLUTION_CIF_1 PMEM_SENSOR_FULL_RESOLUTION_02\r
+          #endif\r
+    #endif\r
+#endif\r
+#endif\r
+\r
+#ifdef CONFIG_SENSOR_IIC_ADDR_11\r
+#if (CONFIG_SENSOR_IIC_ADDR_11 != 0x00)\r
+#define PMEM_SENSOR_FULL_RESOLUTION_11  CONS(CONFIG_SENSOR_11,_FULL_RESOLUTION)\r
+\r
+    #ifdef CONFIG_SENSOR_CIF_INDEX_11\r
+    #define SENSOR_CIF_BUSID_11             CONS(RK_CAM_PLATFORM_DEV_ID_,CONFIG_SENSOR_CIF_INDEX_11)\r
+    #else\r
+    #define SENSOR_CIF_BUSID_11             RK29_CAM_PLATFORM_DEV_ID\r
+    #endif\r
+    \r
+    #if !(PMEM_SENSOR_FULL_RESOLUTION_11)\r
+    #undef PMEM_SENSOR_FULL_RESOLUTION_11\r
+    #define PMEM_SENSOR_FULL_RESOLUTION_11  RK_CAM_SUPPORT_RESOLUTION\r
+    #endif\r
+    #if (SENSOR_CIF_BUSID_12 == RK_CAM_PLATFORM_DEV_ID_0)\r
+          #if (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 < PMEM_SENSOR_FULL_RESOLUTION_11)\r
+          #undef PMEM_SENSOR_FULL_RESOLUTION_CIF_0\r
+          #define PMEM_SENSOR_FULL_RESOLUTION_CIF_0 PMEM_SENSOR_FULL_RESOLUTION_11\r
+          #endif\r
+    #else\r
+          #if (PMEM_SENSOR_FULL_RESOLUTION_CIF_1 < PMEM_SENSOR_FULL_RESOLUTION_11)\r
+          #undef PMEM_SENSOR_FULL_RESOLUTION_CIF_1\r
+          #define PMEM_SENSOR_FULL_RESOLUTION_CIF_1 PMEM_SENSOR_FULL_RESOLUTION_11\r
+          #endif\r
+    #endif\r
+#endif\r
+#endif\r
+\r
+\r
+#ifdef CONFIG_SENSOR_IIC_ADDR_12\r
+#if (CONFIG_SENSOR_IIC_ADDR_12 != 0x00)\r
+#define PMEM_SENSOR_FULL_RESOLUTION_12  CONS(CONFIG_SENSOR_12,_FULL_RESOLUTION)\r
+\r
+    #ifdef CONFIG_SENSOR_CIF_INDEX_12\r
+    #define SENSOR_CIF_BUSID_12             CONS(RK_CAM_PLATFORM_DEV_ID_,CONFIG_SENSOR_CIF_INDEX_12)\r
+    #else\r
+    #define SENSOR_CIF_BUSID_12             RK29_CAM_PLATFORM_DEV_ID\r
+    #endif\r
+    \r
+    #if !(PMEM_SENSOR_FULL_RESOLUTION_12)\r
+    #undef PMEM_SENSOR_FULL_RESOLUTION_12\r
+    #define PMEM_SENSOR_FULL_RESOLUTION_12  RK_CAM_SUPPORT_RESOLUTION\r
+    #endif\r
+    #if (SENSOR_CIF_BUSID_12 == RK_CAM_PLATFORM_DEV_ID_0)\r
+          #if (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 < PMEM_SENSOR_FULL_RESOLUTION_12)\r
+          #undef PMEM_SENSOR_FULL_RESOLUTION_CIF_0\r
+          #define PMEM_SENSOR_FULL_RESOLUTION_CIF_0 PMEM_SENSOR_FULL_RESOLUTION_12\r
+          #endif\r
+    #else\r
+          #if (PMEM_SENSOR_FULL_RESOLUTION_CIF_1 < PMEM_SENSOR_FULL_RESOLUTION_12)\r
+          #undef PMEM_SENSOR_FULL_RESOLUTION_CIF_1\r
+          #define PMEM_SENSOR_FULL_RESOLUTION_CIF_1 PMEM_SENSOR_FULL_RESOLUTION_12\r
+          #endif\r
+    #endif\r
+#endif\r
+#endif\r
+\r
+#if (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 > RK_CAM_SUPPORT_RESOLUTION)\r
+    #error "PMEM_SENSOR_FULL_RESOLUTION_CIF_0 is larger than 5Meag"\r
+#endif\r
+\r
+#if (PMEM_SENSOR_FULL_RESOLUTION_CIF_1 > RK_CAM_SUPPORT_RESOLUTION)\r
+    #error "PMEM_SENSOR_FULL_RESOLUTION_CIF_1 is larger than 5Meag"\r
+#endif\r
+\r
+//CIF 0\r
+#if (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 == 0x500000)\r
+#define PMEM_CAM_NECESSARY_CIF_0   0x1400000       /* 1280*720*1.5*4(preview) + 7.5M(capture raw) + 4M(jpeg encode output) */\r
+#define PMEM_CAMIPP_NECESSARY_CIF_0    0x800000\r
+#elif (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 == 0x300000)\r
+#define PMEM_CAM_NECESSARY_CIF_0   0xe00000        /* 1280*720*1.5*4(preview) + 4.5M(capture raw) + 3M(jpeg encode output) */\r
+#define PMEM_CAMIPP_NECESSARY_CIF_0    0x500000\r
+#elif (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 == 0x200000) /* 1280*720*1.5*4(preview) + 3M(capture raw) + 3M(jpeg encode output) */\r
+#define PMEM_CAM_NECESSARY_CIF_0   0xc00000\r
+#define PMEM_CAMIPP_NECESSARY_CIF_0    0x400000\r
+#elif ((PMEM_SENSOR_FULL_RESOLUTION_CIF_0 == 0x100000) || (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 == 0x130000))\r
+#define PMEM_CAM_NECESSARY_CIF_0   0x800000        /* 800*600*1.5*4(preview) + 2M(capture raw) + 2M(jpeg encode output) */\r
+#define PMEM_CAMIPP_NECESSARY_CIF_0    0x400000\r
+#elif (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 == 0x30000)\r
+#define PMEM_CAM_NECESSARY_CIF_0   0x400000        /* 640*480*1.5*4(preview) + 1M(capture raw) + 1M(jpeg encode output) */\r
+#define PMEM_CAMIPP_NECESSARY_CIF_0    0x400000\r
+#elif (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 == 0x00)\r
+#define PMEM_CAM_NECESSARY_CIF_0   0x00\r
+#define PMEM_CAMIPP_NECESSARY_CIF_0    0x00\r
+#else\r
+#define PMEM_CAM_NECESSARY_CIF_0   0x1400000\r
+#define PMEM_CAMIPP_NECESSARY_CIF_0    0x800000\r
+#endif\r
+\r
+//CIF 1\r
+#if (PMEM_SENSOR_FULL_RESOLUTION_CIF_1 == 0x500000)\r
+#define PMEM_CAM_NECESSARY_CIF_1        0x1400000               /* 1280*720*1.5*4(preview) + 7.5M(capture raw) + 4M(jpeg encode output) */\r
+#define PMEM_CAMIPP_NECESSARY_CIF_1      0x800000\r
+#elif (PMEM_SENSOR_FULL_RESOLUTION_CIF_1 == 0x300000)\r
+#define PMEM_CAM_NECESSARY_CIF_1        0xe00000                /* 1280*720*1.5*4(preview) + 4.5M(capture raw) + 3M(jpeg encode output) */\r
+#define PMEM_CAMIPP_NECESSARY_CIF_1    0x500000\r
+#elif (PMEM_SENSOR_FULL_RESOLUTION_CIF_1== 0x200000) /* 1280*720*1.5*4(preview) + 3M(capture raw) + 3M(jpeg encode output) */\r
+#define PMEM_CAM_NECESSARY_CIF_1        0xc00000\r
+#define PMEM_CAMIPP_NECESSARY_CIF_1    0x400000\r
+#elif ((PMEM_SENSOR_FULL_RESOLUTION_CIF_1 == 0x100000) || (PMEM_SENSOR_FULL_RESOLUTION_CIF_1 == 0x130000))\r
+#define PMEM_CAM_NECESSARY_CIF_1        0x800000                /* 800*600*1.5*4(preview) + 2M(capture raw) + 2M(jpeg encode output) */\r
+#define PMEM_CAMIPP_NECESSARY_CIF_1    0x400000\r
+#elif (PMEM_SENSOR_FULL_RESOLUTION_CIF_1 == 0x30000)\r
+#define PMEM_CAM_NECESSARY_CIF_1        0x400000                /* 640*480*1.5*4(preview) + 1M(capture raw) + 1M(jpeg encode output) */\r
+#define PMEM_CAMIPP_NECESSARY_CIF_1    0x400000\r
+#elif (PMEM_SENSOR_FULL_RESOLUTION_CIF_1 == 0x00)\r
+#define PMEM_CAM_NECESSARY_CIF_1   0x00\r
+#define PMEM_CAMIPP_NECESSARY_CIF_1    0x00\r
+#else\r
+#define PMEM_CAM_NECESSARY_CIF_1        0x1400000\r
+#define PMEM_CAMIPP_NECESSARY_CIF_1    0x800000\r
+#endif\r
+\r
+\r
+#ifdef CONFIG_VIDEO_RKCIF_WORK_SIMUL_OFF\r
+    #if (PMEM_CAM_NECESSARY_CIF_0 > PMEM_CAM_NECESSARY_CIF_1)\r
+    #define PMEM_CAM_NECESSARY PMEM_CAM_NECESSARY_CIF_0\r
+    #define PMEM_CAMIPP_NECESSARY PMEM_CAMIPP_NECESSARY_CIF_0\r
+    #else\r
+    #define PMEM_CAM_NECESSARY PMEM_CAM_NECESSARY_CIF_1\r
+    #define PMEM_CAMIPP_NECESSARY PMEM_CAMIPP_NECESSARY_CIF_1\r
+    #endif\r
+#else\r
+    #ifdef CONFIG_ARCH_RK29\r
+    #warning "Camera driver config two CIF work simultaneity,but rk29 has only one CIF"\r
+    #endif\r
+    #define PMEM_CAM_NECESSARY PMEM_CAM_NECESSARY_CIF_0\r
+    #define PMEM_CAMIPP_NECESSARY PMEM_CAMIPP_NECESSARY_CIF_0    \r
+#endif\r
+\r
+\r
+#ifdef CONFIG_VIDEO_RK29_CAMMEM_ION\r
+    #ifdef CONFIG_ARCH_RK29\r
+    #undef PMEM_CAM_NECESSARY\r
+    #define PMEM_CAM_NECESSARY 0x00000000\r
+    #endif\r
+#else\r
+    #ifdef CONFIG_ARCH_RK30\r
+    #error "Camera driver memory configuration is alloc from pmem, but ARCH_RK30 isn't support"\r
+    #endif    \r
+#endif\r
+\r
+\r
+/*---------------- Camera Sensor Fixed Macro End  ------------------------*/\r
+#else  //#ifdef CONFIG_VIDEO_RK \r
+#define PMEM_CAM_NECESSARY      0x00000000\r
+#endif\r
+\r
+#else   // #ifndef PMEM_CAM_SIZE\r
+\r
+static int camera_debug;\r
+module_param(camera_debug, int, S_IRUGO|S_IWUSR);    \r
+\r
+#define ddprintk(level, fmt, arg...) do {                      \\r
+       if (camera_debug >= level)                                      \\r
+           printk(KERN_WARNING"rk_cam_io: " fmt , ## arg); } while (0)\r
+\r
+#define dprintk(format, ...) ddprintk(1, format, ## __VA_ARGS__)    \r
+\r
+#define SENSOR_NAME_0 STR(CONFIG_SENSOR_0)                     /* back camera sensor 0 */\r
+#define SENSOR_NAME_1 STR(CONFIG_SENSOR_1)                     /* front camera sensor 0 */\r
+#define SENSOR_DEVICE_NAME_0  STR(CONS(CONFIG_SENSOR_0, _back))\r
+#define SENSOR_DEVICE_NAME_1  STR(CONS(CONFIG_SENSOR_1, _front))\r
+#ifdef CONFIG_SENSOR_01\r
+#define SENSOR_NAME_01 STR(CONFIG_SENSOR_01)                   /* back camera sensor 1 */\r
+#define SENSOR_DEVICE_NAME_01  STR(CONS(CONFIG_SENSOR_01, _back_1))\r
+#endif\r
+#ifdef CONFIG_SENSOR_02\r
+#define SENSOR_NAME_02 STR(CONFIG_SENSOR_02)                   /* back camera sensor 2 */\r
+#define SENSOR_DEVICE_NAME_02  STR(CONS(CONFIG_SENSOR_02, _back_2))\r
+#endif\r
+#ifdef CONFIG_SENSOR_11\r
+#define SENSOR_NAME_11 STR(CONFIG_SENSOR_11)                   /* front camera sensor 1 */\r
+#define SENSOR_DEVICE_NAME_11  STR(CONS(CONFIG_SENSOR_11, _front_1))\r
+#endif\r
+#ifdef CONFIG_SENSOR_12\r
+#define SENSOR_NAME_12 STR(CONFIG_SENSOR_12)                   /* front camera sensor 2 */\r
+#define SENSOR_DEVICE_NAME_12  STR(CONS(CONFIG_SENSOR_12, _front_2))\r
+#endif\r
+\r
+static int rk_sensor_io_init(void);\r
+static int rk_sensor_io_deinit(int sensor);\r
+static int rk_sensor_ioctrl(struct device *dev,enum rk29camera_ioctrl_cmd cmd, int on);\r
+static int rk_sensor_power(struct device *dev, int on);\r
+static int rk_sensor_reset(struct device *dev);\r
+static int rk_sensor_powerdown(struct device *dev, int on);\r
+\r
+static struct rk29camera_platform_data rk_camera_platform_data = {\r
+    .io_init = rk_sensor_io_init,\r
+    .io_deinit = rk_sensor_io_deinit,\r
+    .iomux = rk_sensor_iomux,\r
+    .sensor_ioctrl = rk_sensor_ioctrl,\r
+    \r
+    .gpio_res = {\r
+        {\r
+            .gpio_reset = CONFIG_SENSOR_RESET_PIN_0,\r
+            .gpio_power = CONFIG_SENSOR_POWER_PIN_0,\r
+            .gpio_powerdown = CONFIG_SENSOR_POWERDN_PIN_0,\r
+            .gpio_flash = CONFIG_SENSOR_FALSH_PIN_0,\r
+            .gpio_flag = (CONFIG_SENSOR_POWERACTIVE_LEVEL_0|CONFIG_SENSOR_RESETACTIVE_LEVEL_0|CONFIG_SENSOR_POWERDNACTIVE_LEVEL_0|CONFIG_SENSOR_FLASHACTIVE_LEVEL_0),\r
+            .gpio_init = 0,            \r
+            .dev_name = SENSOR_DEVICE_NAME_0,\r
+        }, {\r
+            .gpio_reset = CONFIG_SENSOR_RESET_PIN_1,\r
+            .gpio_power = CONFIG_SENSOR_POWER_PIN_1,\r
+            .gpio_powerdown = CONFIG_SENSOR_POWERDN_PIN_1,\r
+            .gpio_flash = CONFIG_SENSOR_FALSH_PIN_1,\r
+            .gpio_flag = (CONFIG_SENSOR_POWERACTIVE_LEVEL_1|CONFIG_SENSOR_RESETACTIVE_LEVEL_1|CONFIG_SENSOR_POWERDNACTIVE_LEVEL_1|CONFIG_SENSOR_FLASHACTIVE_LEVEL_1),\r
+            .gpio_init = 0,\r
+            .dev_name = SENSOR_DEVICE_NAME_1,\r
+        }, \r
+        #ifdef CONFIG_SENSOR_01\r
+        {\r
+        #if CONFIG_SENSOR_IIC_ADDR_01\r
+            .gpio_reset = CONFIG_SENSOR_RESET_PIN_01,\r
+            .gpio_power = CONFIG_SENSOR_POWER_PIN_01,\r
+            .gpio_powerdown = CONFIG_SENSOR_POWERDN_PIN_01,\r
+            .gpio_flash = CONFIG_SENSOR_FALSH_PIN_01,\r
+            .gpio_flag = (CONFIG_SENSOR_POWERACTIVE_LEVEL_01|CONFIG_SENSOR_RESETACTIVE_LEVEL_01|CONFIG_SENSOR_POWERDNACTIVE_LEVEL_01|CONFIG_SENSOR_FLASHACTIVE_LEVEL_01),\r
+            .gpio_init = 0,            \r
+            .dev_name = SENSOR_DEVICE_NAME_01,\r
+        #else\r
+            .gpio_reset = INVALID_GPIO,\r
+            .gpio_power = INVALID_GPIO,\r
+            .gpio_powerdown = INVALID_GPIO,\r
+            .gpio_flash = INVALID_GPIO,\r
+            .gpio_flag = 0,\r
+            .gpio_init = 0,            \r
+            .dev_name = NULL,\r
+        #endif\r
+        }, \r
+        #endif\r
+        #ifdef CONFIG_SENSOR_02\r
+        {\r
+        #if CONFIG_SENSOR_IIC_ADDR_02\r
+            .gpio_reset = CONFIG_SENSOR_RESET_PIN_02,\r
+            .gpio_power = CONFIG_SENSOR_POWER_PIN_02,\r
+            .gpio_powerdown = CONFIG_SENSOR_POWERDN_PIN_02,\r
+            .gpio_flash = CONFIG_SENSOR_FALSH_PIN_02,\r
+            .gpio_flag = (CONFIG_SENSOR_POWERACTIVE_LEVEL_02|CONFIG_SENSOR_RESETACTIVE_LEVEL_02|CONFIG_SENSOR_POWERDNACTIVE_LEVEL_02|CONFIG_SENSOR_FLASHACTIVE_LEVEL_02),\r
+            .gpio_init = 0,            \r
+            .dev_name = SENSOR_DEVICE_NAME_02, \r
+        #else\r
+            .gpio_reset = INVALID_GPIO,\r
+            .gpio_power = INVALID_GPIO,\r
+            .gpio_powerdown = INVALID_GPIO,\r
+            .gpio_flash = INVALID_GPIO,\r
+            .gpio_flag = 0,\r
+            .gpio_init = 0,            \r
+            .dev_name = NULL,\r
+        #endif        \r
+        },\r
+        #endif\r
+        #ifdef CONFIG_SENSOR_11\r
+        {\r
+        #if CONFIG_SENSOR_IIC_ADDR_11\r
+            .gpio_reset = CONFIG_SENSOR_RESET_PIN_11,\r
+            .gpio_power = CONFIG_SENSOR_POWER_PIN_11,\r
+            .gpio_powerdown = CONFIG_SENSOR_POWERDN_PIN_11,\r
+            .gpio_flash = CONFIG_SENSOR_FALSH_PIN_11,\r
+            .gpio_flag = (CONFIG_SENSOR_POWERACTIVE_LEVEL_11|CONFIG_SENSOR_RESETACTIVE_LEVEL_11|CONFIG_SENSOR_POWERDNACTIVE_LEVEL_11|CONFIG_SENSOR_FLASHACTIVE_LEVEL_11),\r
+            .gpio_init = 0,\r
+            .dev_name = SENSOR_DEVICE_NAME_11,\r
+        #else\r
+            .gpio_reset = INVALID_GPIO,\r
+            .gpio_power = INVALID_GPIO,\r
+            .gpio_powerdown = INVALID_GPIO,\r
+            .gpio_flash = INVALID_GPIO,\r
+            .gpio_flag = 0,\r
+            .gpio_init = 0,            \r
+            .dev_name = NULL,\r
+        #endif        \r
+        }, \r
+        #endif\r
+        #ifdef CONFIG_SENSOR_12\r
+        {\r
+        #if CONFIG_SENSOR_IIC_ADDR_12\r
+            .gpio_reset = CONFIG_SENSOR_RESET_PIN_12,\r
+            .gpio_power = CONFIG_SENSOR_POWER_PIN_12,\r
+            .gpio_powerdown = CONFIG_SENSOR_POWERDN_PIN_12,\r
+            .gpio_flash = CONFIG_SENSOR_FALSH_PIN_12,\r
+            .gpio_flag = (CONFIG_SENSOR_POWERACTIVE_LEVEL_12|CONFIG_SENSOR_RESETACTIVE_LEVEL_12|CONFIG_SENSOR_POWERDNACTIVE_LEVEL_12|CONFIG_SENSOR_FLASHACTIVE_LEVEL_12),\r
+            .gpio_init = 0,\r
+            .dev_name = SENSOR_DEVICE_NAME_12,\r
+        #else\r
+            .gpio_reset = INVALID_GPIO,\r
+            .gpio_power = INVALID_GPIO,\r
+            .gpio_powerdown = INVALID_GPIO,\r
+            .gpio_flash = INVALID_GPIO,\r
+            .gpio_flag = 0,\r
+            .gpio_init = 0,            \r
+            .dev_name = NULL,\r
+        #endif\r
+        }\r
+        #endif\r
+    },\r
+    \r
+    #ifdef CONFIG_VIDEO_RK29_WORK_IPP\r
+    #ifdef MEM_CAMIPP_BASE\r
+       .meminfo = {\r
+           .name  = "camera_ipp_mem",\r
+               .start = MEM_CAMIPP_BASE,\r
+               .size   = MEM_CAMIPP_SIZE,\r
+       },\r
+       #endif\r
+       #endif\r
+    \r
+    .info = {\r
+        {\r
+            .dev_name = SENSOR_DEVICE_NAME_0,\r
+            .orientation = CONFIG_SENSOR_ORIENTATION_0,  \r
+        },{\r
+            .dev_name = SENSOR_DEVICE_NAME_1,\r
+            .orientation = CONFIG_SENSOR_ORIENTATION_1,\r
+        #ifdef CONFIG_SENSOR_01\r
+           },{\r
+               .dev_name = SENSOR_DEVICE_NAME_01,\r
+            .orientation = CONFIG_SENSOR_ORIENTATION_01, \r
+        #else\r
+        },{\r
+               .dev_name = NULL,\r
+            .orientation = 0x00, \r
+        #endif\r
+        #ifdef CONFIG_SENSOR_02\r
+           },{\r
+               .dev_name = SENSOR_DEVICE_NAME_02,\r
+            .orientation = CONFIG_SENSOR_ORIENTATION_02, \r
+        #else\r
+        },{\r
+               .dev_name = NULL,\r
+            .orientation = 0x00, \r
+        #endif\r
+        \r
+        #ifdef CONFIG_SENSOR_11 \r
+        },{\r
+            .dev_name = SENSOR_DEVICE_NAME_11,\r
+            .orientation = CONFIG_SENSOR_ORIENTATION_11, \r
+        #else\r
+        },{\r
+               .dev_name = NULL,\r
+            .orientation = 0x00, \r
+        #endif\r
+        #ifdef CONFIG_SENSOR_12\r
+           },{\r
+               .dev_name = SENSOR_DEVICE_NAME_12,\r
+            .orientation = CONFIG_SENSOR_ORIENTATION_12, \r
+        #else\r
+        },{\r
+               .dev_name = NULL,\r
+            .orientation = 0x00, \r
+        #endif\r
+           },\r
+       },\r
+    \r
+    .register_dev = {\r
+        #ifdef CONFIG_SENSOR_0\r
+        {\r
+        #if (CONFIG_SENSOR_IIC_ADDR_0 != 0x00)\r
+            .i2c_cam_info = {\r
+                I2C_BOARD_INFO(SENSOR_NAME_0, CONFIG_SENSOR_IIC_ADDR_0>>1),\r
+            },\r
+            .link_info = {\r
+                #ifdef SENSOR_CIF_BUSID_0\r
+               .bus_id= SENSOR_CIF_BUSID_0,\r
+               #else\r
+                .bus_id= RK29_CAM_PLATFORM_DEV_ID,\r
+                #endif\r
+               .power          = rk_sensor_power,\r
+                #if (CONFIG_SENSOR_RESET_PIN_0 != INVALID_GPIO)\r
+               .reset          = rk_sensor_reset,\r
+                #endif   \r
+               .powerdown      = rk_sensor_powerdown,\r
+               //.board_info = &rk_i2c_cam_info_0[0],\r
+               \r
+               .i2c_adapter_id = CONFIG_SENSOR_IIC_ADAPTER_ID_0,\r
+               .module_name    = SENSOR_NAME_0,\r
+            },\r
+            .device_info = {\r
+               .name   = "soc-camera-pdrv",\r
+               //.id = 0,\r
+               .dev    = {\r
+                       .init_name = SENSOR_DEVICE_NAME_0,\r
+                       //.platform_data = &rk_iclink_0,\r
+               }\r
+            }\r
+        #endif\r
+           },\r
+        #endif\r
+        #ifdef CONFIG_SENSOR_1\r
+        {\r
+           #if (CONFIG_SENSOR_IIC_ADDR_1 != 0x00)\r
+            .i2c_cam_info = {\r
+                I2C_BOARD_INFO(SENSOR_NAME_1, CONFIG_SENSOR_IIC_ADDR_1>>1)\r
+            },\r
+            .link_info = {\r
+               #ifdef SENSOR_CIF_BUSID_1\r
+               .bus_id= SENSOR_CIF_BUSID_1,\r
+               #else\r
+                .bus_id= RK29_CAM_PLATFORM_DEV_ID,\r
+                #endif\r
+               .power          = rk_sensor_power,\r
+                #if (CONFIG_SENSOR_RESET_PIN_1 != INVALID_GPIO)\r
+               .reset          = rk_sensor_reset,\r
+                #endif   \r
+               .powerdown      = rk_sensor_powerdown,\r
+               //.board_info = &rk_i2c_cam_info_0[0],\r
+               \r
+               .i2c_adapter_id = CONFIG_SENSOR_IIC_ADAPTER_ID_1,\r
+               .module_name    = SENSOR_NAME_1,\r
+            },\r
+            .device_info = {\r
+               .name   = "soc-camera-pdrv",\r
+               //.id = 1,\r
+               .dev    = {\r
+                       .init_name = SENSOR_DEVICE_NAME_1,\r
+                       //.platform_data = &rk_iclink_0,\r
+               }\r
+            }\r
+        #endif\r
+           },\r
+           #endif\r
+        #ifdef CONFIG_SENSOR_01\r
+        {\r
+        #if (CONFIG_SENSOR_IIC_ADDR_01 != 0x00)\r
+            .i2c_cam_info = {\r
+                I2C_BOARD_INFO(SENSOR_NAME_01, CONFIG_SENSOR_IIC_ADDR_01>>1)\r
+            },\r
+            .link_info = {\r
+               #ifdef SENSOR_CIF_BUSID_1\r
+               .bus_id= SENSOR_CIF_BUSID_1,\r
+               #else\r
+                .bus_id= RK29_CAM_PLATFORM_DEV_ID,\r
+                #endif\r
+               .power          = rk_sensor_power,\r
+                #if (CONFIG_SENSOR_RESET_PIN_1 != INVALID_GPIO)\r
+               .reset          = rk_sensor_reset,\r
+                #endif   \r
+               .powerdown      = rk_sensor_powerdown,\r
+               //.board_info = &rk_i2c_cam_info_0[0],\r
+               \r
+               .i2c_adapter_id = CONFIG_SENSOR_IIC_ADAPTER_ID_01,\r
+               .module_name    = SENSOR_NAME_01,\r
+            },\r
+            .device_info = {\r
+               .name   = "soc-camera-pdrv",\r
+               //.id = 1,\r
+               .dev    = {\r
+                       .init_name = SENSOR_DEVICE_NAME_01,\r
+                       //.platform_data = &rk_iclink_0,\r
+               }\r
+            }\r
+        #endif\r
+           },\r
+        #endif\r
+        #ifdef CONFIG_SENSOR_02 \r
+        {\r
+           #if (CONFIG_SENSOR_IIC_ADDR_02 != 0x00)\r
+            .i2c_cam_info = {\r
+                I2C_BOARD_INFO(SENSOR_NAME_02, CONFIG_SENSOR_IIC_ADDR_02>>1)\r
+            },\r
+            .link_info = {\r
+               #ifdef SENSOR_CIF_BUSID_1\r
+               .bus_id= SENSOR_CIF_BUSID_1,\r
+               #else\r
+                .bus_id= RK29_CAM_PLATFORM_DEV_ID,\r
+                #endif\r
+               .power          = rk_sensor_power,\r
+                #if (CONFIG_SENSOR_RESET_PIN_1 != INVALID_GPIO)\r
+               .reset          = rk_sensor_reset,\r
+                #endif   \r
+               .powerdown      = rk_sensor_powerdown,\r
+               //.board_info = &rk_i2c_cam_info_0[0],\r
+               \r
+               .i2c_adapter_id = CONFIG_SENSOR_IIC_ADAPTER_ID_02,\r
+               .module_name    = SENSOR_NAME_02,\r
+            },\r
+            .device_info = {\r
+               .name   = "soc-camera-pdrv",\r
+               //.id = 1,\r
+               .dev    = {\r
+                       .init_name = SENSOR_DEVICE_NAME_02,\r
+                       //.platform_data = &rk_iclink_0,\r
+               }\r
+            }\r
+        #endif\r
+           },\r
+        #endif\r
+        #ifdef CONFIG_SENSOR_11\r
+        {          \r
+        #if (CONFIG_SENSOR_IIC_ADDR_11 != 0x00)\r
+            .i2c_cam_info = {\r
+                I2C_BOARD_INFO(SENSOR_NAME_11, CONFIG_SENSOR_IIC_ADDR_11>>1)\r
+            },\r
+            .link_info = {\r
+               #ifdef SENSOR_CIF_BUSID_1\r
+               .bus_id= SENSOR_CIF_BUSID_1,\r
+               #else\r
+                .bus_id= RK29_CAM_PLATFORM_DEV_ID,\r
+                #endif\r
+               .power          = rk_sensor_power,\r
+                #if (CONFIG_SENSOR_RESET_PIN_1 != INVALID_GPIO)\r
+               .reset          = rk_sensor_reset,\r
+                #endif   \r
+               .powerdown      = rk_sensor_powerdown,\r
+               //.board_info = &rk_i2c_cam_info_0[0],\r
+               \r
+               .i2c_adapter_id = CONFIG_SENSOR_IIC_ADAPTER_ID_11,\r
+               .module_name    = SENSOR_NAME_11,\r
+            },\r
+            .device_info = {\r
+               .name   = "soc-camera-pdrv",\r
+               //.id = 1,\r
+               .dev    = {\r
+                       .init_name = SENSOR_DEVICE_NAME_11,\r
+                       //.platform_data = &rk_iclink_0,\r
+               }\r
+            }\r
+        #endif        \r
+           },\r
+        #endif\r
+        #ifdef CONFIG_SENSOR_12\r
+        {          \r
+           #if (CONFIG_SENSOR_IIC_ADDR_12 != 0x00)\r
+            .i2c_cam_info = {\r
+                I2C_BOARD_INFO(SENSOR_NAME_12, CONFIG_SENSOR_IIC_ADDR_12>>1)\r
+            },\r
+            .link_info = {\r
+               #ifdef SENSOR_CIF_BUSID_1\r
+               .bus_id= SENSOR_CIF_BUSID_1,\r
+               #else\r
+                .bus_id= RK29_CAM_PLATFORM_DEV_ID,\r
+                #endif\r
+               .power          = rk_sensor_power,\r
+                #if (CONFIG_SENSOR_RESET_PIN_1 != INVALID_GPIO)\r
+               .reset          = rk_sensor_reset,\r
+                #endif   \r
+               .powerdown      = rk_sensor_powerdown,\r
+               //.board_info = &rk_i2c_cam_info_0[0],\r
+               \r
+               .i2c_adapter_id = CONFIG_SENSOR_IIC_ADAPTER_ID_12,\r
+               .module_name    = SENSOR_NAME_12,\r
+            },\r
+            .device_info = {\r
+               .name   = "soc-camera-pdrv",\r
+               //.id = 1,\r
+               .dev    = {\r
+                       .init_name = SENSOR_DEVICE_NAME_12,\r
+                       //.platform_data = &rk_iclink_0,\r
+               }\r
+            }\r
+        #endif        \r
+           },\r
+        #endif\r
+       },\r
+};\r
+\r
+\r
+static int sensor_power_default_cb (struct rk29camera_gpio_res *res, int on)\r
+{\r
+    int camera_power = res->gpio_power;\r
+    int camera_ioflag = res->gpio_flag;\r
+    int camera_io_init = res->gpio_init;\r
+    int ret = 0;\r
+    \r
+    if (camera_power != INVALID_GPIO)  {\r
+               if (camera_io_init & RK29_CAM_POWERACTIVE_MASK) {\r
+            if (on) {\r
+               gpio_set_value(camera_power, ((camera_ioflag&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
+                       dprintk("%s..%s..PowerPin=%d ..PinLevel = %x   \n",__FUNCTION__,res->dev_name, camera_power, ((camera_ioflag&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
+                       msleep(10);\r
+               } else {\r
+                       gpio_set_value(camera_power, (((~camera_ioflag)&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
+                       dprintk("%s..%s..PowerPin=%d ..PinLevel = %x   \n",__FUNCTION__,res->dev_name, camera_power, (((~camera_ioflag)&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
+               }\r
+               } else {\r
+                       ret = RK29_CAM_EIO_REQUESTFAIL;\r
+                       printk("%s..%s..PowerPin=%d request failed!\n",__FUNCTION__,res->dev_name,camera_power);\r
+           }        \r
+    } else {\r
+               ret = RK29_CAM_EIO_INVALID;\r
+    } \r
+\r
+    return ret;\r
+}\r
+\r
+static int sensor_reset_default_cb (struct rk29camera_gpio_res *res, int on)\r
+{\r
+    int camera_reset = res->gpio_reset;\r
+    int camera_ioflag = res->gpio_flag;\r
+    int camera_io_init = res->gpio_init;  \r
+    int ret = 0;\r
+    \r
+    if (camera_reset != INVALID_GPIO) {\r
+               if (camera_io_init & RK29_CAM_RESETACTIVE_MASK) {\r
+                       if (on) {\r
+                       gpio_set_value(camera_reset, ((camera_ioflag&RK29_CAM_RESETACTIVE_MASK)>>RK29_CAM_RESETACTIVE_BITPOS));\r
+                       dprintk("%s..%s..ResetPin=%d ..PinLevel = %x \n",__FUNCTION__,res->dev_name,camera_reset, ((camera_ioflag&RK29_CAM_RESETACTIVE_MASK)>>RK29_CAM_RESETACTIVE_BITPOS));\r
+                       } else {\r
+                               gpio_set_value(camera_reset,(((~camera_ioflag)&RK29_CAM_RESETACTIVE_MASK)>>RK29_CAM_RESETACTIVE_BITPOS));\r
+                       dprintk("%s..%s..ResetPin= %d..PinLevel = %x   \n",__FUNCTION__,res->dev_name, camera_reset, (((~camera_ioflag)&RK29_CAM_RESETACTIVE_MASK)>>RK29_CAM_RESETACTIVE_BITPOS));\r
+               }\r
+               } else {\r
+                       ret = RK29_CAM_EIO_REQUESTFAIL;\r
+                       printk("%s..%s..ResetPin=%d request failed!\n",__FUNCTION__,res->dev_name,camera_reset);\r
+               }\r
+    } else {\r
+               ret = RK29_CAM_EIO_INVALID;\r
+    }\r
+\r
+    return ret;\r
+}\r
+\r
+static int sensor_powerdown_default_cb (struct rk29camera_gpio_res *res, int on)\r
+{\r
+    int camera_powerdown = res->gpio_powerdown;\r
+    int camera_ioflag = res->gpio_flag;\r
+    int camera_io_init = res->gpio_init;  \r
+    int ret = 0;    \r
+\r
+    if (camera_powerdown != INVALID_GPIO) {\r
+               if (camera_io_init & RK29_CAM_POWERDNACTIVE_MASK) {\r
+                       if (on) {\r
+                       gpio_set_value(camera_powerdown, ((camera_ioflag&RK29_CAM_POWERDNACTIVE_MASK)>>RK29_CAM_POWERDNACTIVE_BITPOS));\r
+                       dprintk("%s..%s..PowerDownPin=%d ..PinLevel = %x \n",__FUNCTION__,res->dev_name,camera_powerdown, ((camera_ioflag&RK29_CAM_POWERDNACTIVE_MASK)>>RK29_CAM_POWERDNACTIVE_BITPOS));\r
+                       } else {\r
+                               gpio_set_value(camera_powerdown,(((~camera_ioflag)&RK29_CAM_POWERDNACTIVE_MASK)>>RK29_CAM_POWERDNACTIVE_BITPOS));\r
+                       dprintk("%s..%s..PowerDownPin= %d..PinLevel = %x   \n",__FUNCTION__,res->dev_name, camera_powerdown, (((~camera_ioflag)&RK29_CAM_POWERDNACTIVE_MASK)>>RK29_CAM_POWERDNACTIVE_BITPOS));\r
+               }\r
+               } else {\r
+                       ret = RK29_CAM_EIO_REQUESTFAIL;\r
+                       dprintk("%s..%s..PowerDownPin=%d request failed!\n",__FUNCTION__,res->dev_name,camera_powerdown);\r
+               }\r
+    } else {\r
+               ret = RK29_CAM_EIO_INVALID;\r
+    }\r
+    return ret;\r
+}\r
+\r
+\r
+static int sensor_flash_default_cb (struct rk29camera_gpio_res *res, int on)\r
+{\r
+    int camera_flash = res->gpio_flash;\r
+    int camera_ioflag = res->gpio_flag;\r
+    int camera_io_init = res->gpio_init;  \r
+    int ret = 0;    \r
+\r
+    if (camera_flash != INVALID_GPIO) {\r
+               if (camera_io_init & RK29_CAM_FLASHACTIVE_MASK) {\r
+            switch (on)\r
+            {\r
+                case Flash_Off:\r
+                {\r
+                    gpio_set_value(camera_flash,(((~camera_ioflag)&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));\r
+                           dprintk("\n%s..%s..FlashPin= %d..PinLevel = %x   \n",__FUNCTION__,res->dev_name, camera_flash, (((~camera_ioflag)&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS)); \r
+                           break;\r
+                }\r
+\r
+                case Flash_On:\r
+                {\r
+                    gpio_set_value(camera_flash, ((camera_ioflag&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));\r
+                           dprintk("%s..%s..FlashPin=%d ..PinLevel = %x \n",__FUNCTION__,res->dev_name,camera_flash, ((camera_ioflag&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));\r
+                           break;\r
+                }\r
+\r
+                case Flash_Torch:\r
+                {\r
+                    gpio_set_value(camera_flash, ((camera_ioflag&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));\r
+                           dprintk("%s..%s..FlashPin=%d ..PinLevel = %x \n",__FUNCTION__,res->dev_name,camera_flash, ((camera_ioflag&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));\r
+                           break;\r
+                }\r
+\r
+                default:\r
+                {\r
+                    printk("%s..%s..Flash command(%d) is invalidate \n",__FUNCTION__,res->dev_name,on);\r
+                    break;\r
+                }\r
+            }\r
+               } else {\r
+                       ret = RK29_CAM_EIO_REQUESTFAIL;\r
+                       printk("%s..%s..FlashPin=%d request failed!\n",__FUNCTION__,res->dev_name,camera_flash);\r
+               }\r
+    } else {\r
+               ret = RK29_CAM_EIO_INVALID;\r
+    }\r
+    return ret;\r
+}\r
+static void rk29_sensor_fps_get(int idx, unsigned int *val, int w, int h)\r
+{\r
+    switch (idx)\r
+    {\r
+        case 0:\r
+        {\r
+            if ((w==176) && (h==144)) {\r
+                *val = CONFIG_SENSOR_QCIF_FPS_FIXED_0;\r
+            #ifdef CONFIG_SENSOR_240X160_FPS_FIXED_0\r
+            } else if ((w==240) && (h==160)) {\r
+                *val = CONFIG_SENSOR_240X160_FPS_FIXED_0;\r
+            #endif\r
+            } else if ((w==320) && (h==240)) {\r
+                *val = CONFIG_SENSOR_QVGA_FPS_FIXED_0;\r
+            } else if ((w==352) && (h==288)) {\r
+                *val = CONFIG_SENSOR_CIF_FPS_FIXED_0;\r
+            } else if ((w==640) && (h==480)) {\r
+                *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==1280) && (h==720)) {\r
+                *val = CONFIG_SENSOR_720P_FPS_FIXED_0;\r
+            }\r
+            break;\r
+        }\r
+        #ifdef CONFIG_SENSOR_01\r
+        case 1:\r
+        {\r
+            if ((w==176) && (h==144)) {\r
+                *val = CONFIG_SENSOR_QCIF_FPS_FIXED_01;\r
+            #ifdef CONFIG_SENSOR_240X160_FPS_FIXED_01\r
+            } else if ((w==240) && (h==160)) {\r
+                *val = CONFIG_SENSOR_240X160_FPS_FIXED_01;\r
+            #endif\r
+            } else if ((w==320) && (h==240)) {\r
+                *val = CONFIG_SENSOR_QVGA_FPS_FIXED_01;\r
+            } else if ((w==352) && (h==288)) {\r
+                *val = CONFIG_SENSOR_CIF_FPS_FIXED_01;\r
+            } else if ((w==640) && (h==480)) {\r
+                *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==1280) && (h==720)) {\r
+                *val = CONFIG_SENSOR_720P_FPS_FIXED_01;\r
+            }\r
+            break;\r
+        }\r
+        #endif\r
+        #ifdef CONFIG_SENSOR_02\r
+        case 2:\r
+        {\r
+            if ((w==176) && (h==144)) {\r
+                *val = CONFIG_SENSOR_QCIF_FPS_FIXED_02;\r
+            #ifdef CONFIG_SENSOR_240X160_FPS_FIXED_02\r
+            } else if ((w==240) && (h==160)) {\r
+                *val = CONFIG_SENSOR_240X160_FPS_FIXED_02;\r
+            #endif\r
+            } else if ((w==320) && (h==240)) {\r
+                *val = CONFIG_SENSOR_QVGA_FPS_FIXED_02;\r
+            } else if ((w==352) && (h==288)) {\r
+                *val = CONFIG_SENSOR_CIF_FPS_FIXED_02;\r
+            } else if ((w==640) && (h==480)) {\r
+                *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==1280) && (h==720)) {\r
+                *val = CONFIG_SENSOR_720P_FPS_FIXED_02;\r
+            }\r
+            break;\r
+        }\r
+        #endif\r
+        \r
+        case 3:\r
+        {\r
+            if ((w==176) && (h==144)) {\r
+                *val = CONFIG_SENSOR_QCIF_FPS_FIXED_1;\r
+            #ifdef CONFIG_SENSOR_240X160_FPS_FIXED_1\r
+            } else if ((w==240) && (h==160)) {\r
+                *val = CONFIG_SENSOR_240X160_FPS_FIXED_1;\r
+            #endif\r
+            } else if ((w==320) && (h==240)) {\r
+                *val = CONFIG_SENSOR_QVGA_FPS_FIXED_1;\r
+            } else if ((w==352) && (h==288)) {\r
+                *val = CONFIG_SENSOR_CIF_FPS_FIXED_1;\r
+            } else if ((w==640) && (h==480)) {\r
+                *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==1280) && (h==720)) {\r
+                *val = CONFIG_SENSOR_720P_FPS_FIXED_1;\r
+            }\r
+            break;\r
+        }\r
+        #ifdef CONFIG_SENSOR_11\r
+        case 4:\r
+        {\r
+            if ((w==176) && (h==144)) {\r
+                *val = CONFIG_SENSOR_QCIF_FPS_FIXED_11;\r
+            #ifdef CONFIG_SENSOR_240X160_FPS_FIXED_11\r
+            } else if ((w==240) && (h==160)) {\r
+                *val = CONFIG_SENSOR_240X160_FPS_FIXED_11;\r
+            #endif\r
+            } else if ((w==320) && (h==240)) {\r
+                *val = CONFIG_SENSOR_QVGA_FPS_FIXED_11;\r
+            } else if ((w==352) && (h==288)) {\r
+                *val = CONFIG_SENSOR_CIF_FPS_FIXED_11;\r
+            } else if ((w==640) && (h==480)) {\r
+                *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==1280) && (h==720)) {\r
+                *val = CONFIG_SENSOR_720P_FPS_FIXED_11;\r
+            }\r
+            break;\r
+        }\r
+        #endif\r
+        #ifdef CONFIG_SENSOR_12\r
+        case 5:\r
+        {\r
+            if ((w==176) && (h==144)) {\r
+                *val = CONFIG_SENSOR_QCIF_FPS_FIXED_12;\r
+            #ifdef CONFIG_SENSOR_240X160_FPS_FIXED_12\r
+            } else if ((w==240) && (h==160)) {\r
+                *val = CONFIG_SENSOR_240X160_FPS_FIXED_12;\r
+            #endif\r
+            } else if ((w==320) && (h==240)) {\r
+                *val = CONFIG_SENSOR_QVGA_FPS_FIXED_12;\r
+            } else if ((w==352) && (h==288)) {\r
+                *val = CONFIG_SENSOR_CIF_FPS_FIXED_12;\r
+            } else if ((w==640) && (h==480)) {\r
+                *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==1280) && (h==720)) {\r
+                *val = CONFIG_SENSOR_720P_FPS_FIXED_12;\r
+            }\r
+            break;\r
+        }\r
+        #endif\r
+        default:\r
+            printk(KERN_ERR"rk_cam_io: sensor-%d have not been define in board file!",idx);\r
+    }\r
+}\r
+\r
+static int rk_sensor_io_init(void)\r
+{\r
+    int ret = 0, i,j;\r
+    unsigned int camera_reset = INVALID_GPIO, camera_power = INVALID_GPIO;\r
+       unsigned int camera_powerdown = INVALID_GPIO, camera_flash = INVALID_GPIO;\r
+       unsigned int camera_ioflag;\r
+       static bool is_init = false;\r
+       struct rk29camera_platform_data* plat_data = &rk_camera_platform_data;\r
+\r
+    if(is_init) {              \r
+               return 0;\r
+       } else {\r
+               is_init = true;\r
+       }\r
+    printk("PMEM_CAM_NECESSARY:0x%x PMEM_CAMIPP_NECESSARY:0x%x"\r
+        "PMEM_CAM_NECESSARY_CIF_1:0x%x PMEM_CAMIPP_NECESSARY_CIF_1:0x%x"\r
+        "PMEM_CAM_NECESSARY_CIF_0:0x%x PMEM_CAMIPP_NECESSARY_CIF_0:0x%x",\r
+        PMEM_CAM_NECESSARY,PMEM_CAMIPP_NECESSARY,PMEM_CAM_NECESSARY_CIF_1,PMEM_CAMIPP_NECESSARY_CIF_1,\r
+        PMEM_CAM_NECESSARY_CIF_0,PMEM_CAMIPP_NECESSARY_CIF_0);\r
+    if (sensor_ioctl_cb.sensor_power_cb == NULL)\r
+        sensor_ioctl_cb.sensor_power_cb = sensor_power_default_cb;\r
+    if (sensor_ioctl_cb.sensor_reset_cb == NULL)\r
+        sensor_ioctl_cb.sensor_reset_cb = sensor_reset_default_cb;\r
+    if (sensor_ioctl_cb.sensor_powerdown_cb == NULL)\r
+        sensor_ioctl_cb.sensor_powerdown_cb = sensor_powerdown_default_cb;\r
+    if (sensor_ioctl_cb.sensor_flash_cb == NULL)\r
+        sensor_ioctl_cb.sensor_flash_cb = sensor_flash_default_cb;\r
+    \r
+       for(i = 0;i < RK_CAM_NUM; i++){\r
+        if (plat_data->gpio_res[i].dev_name == NULL)\r
+            continue;\r
+               camera_reset = plat_data->gpio_res[i].gpio_reset;\r
+               camera_power = plat_data->gpio_res[i].gpio_power;\r
+               camera_powerdown = plat_data->gpio_res[i].gpio_powerdown;\r
+               camera_flash = plat_data->gpio_res[i].gpio_flash;\r
+               camera_ioflag = plat_data->gpio_res[i].gpio_flag;\r
+               plat_data->gpio_res[i].gpio_init = 0;\r
+\r
+        if (camera_power != INVALID_GPIO) {\r
+            ret = gpio_request(camera_power, "camera power");\r
+            if (ret) {\r
+                for (j=0; j<i; j++) {\r
+                    if (camera_power == plat_data->gpio_res[j].gpio_power)\r
+                        break;\r
+                }\r
+                if (i==j) {\r
+                    printk(KERN_ERR"rk_cam_io: %s..%s..power pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_power);\r
+                    goto sensor_io_init_erro;\r
+                }\r
+            }\r
+\r
+            if (rk_camera_platform_data.iomux(camera_power) < 0) {\r
+                printk(KERN_ERR "rk_cam_io: %s..%s..power pin(%d) iomux init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_power);\r
+                goto sensor_io_init_erro;\r
+            }\r
+            \r
+                       plat_data->gpio_res[i].gpio_init |= RK29_CAM_POWERACTIVE_MASK;\r
+            gpio_set_value(camera_reset, (((~camera_ioflag)&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
+            gpio_direction_output(camera_power, (((~camera_ioflag)&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
+\r
+                       dprintk("%s....power pin(%d) init success(0x%x)  \n",__FUNCTION__,camera_power,(((~camera_ioflag)&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
+\r
+        }\r
+\r
+        if (camera_reset != INVALID_GPIO) {\r
+            ret = gpio_request(camera_reset, "camera reset");\r
+            if (ret) {\r
+                for (j=0; j<i; j++) {\r
+                    if (camera_reset == plat_data->gpio_res[j].gpio_reset) {                        \r
+                        break;\r
+                    }\r
+                }\r
+                if (i==j) {\r
+                    printk(KERN_ERR"rk_cam_io: %s..%s..reset pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_reset);\r
+                    goto sensor_io_init_erro;\r
+                }\r
+                \r
+                printk("%s..%s..reset pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_reset);\r
+                goto sensor_io_init_erro;\r
+            }\r
+\r
+            if (rk_camera_platform_data.iomux(camera_reset) < 0) {\r
+                printk(KERN_ERR"rk_cam_io: %s..%s..reset pin(%d) iomux init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_reset);\r
+                goto sensor_io_init_erro;\r
+            }\r
+            \r
+                       plat_data->gpio_res[i].gpio_init |= RK29_CAM_RESETACTIVE_MASK;\r
+            gpio_set_value(camera_reset, ((camera_ioflag&RK29_CAM_RESETACTIVE_MASK)>>RK29_CAM_RESETACTIVE_BITPOS));\r
+            gpio_direction_output(camera_reset, ((camera_ioflag&RK29_CAM_RESETACTIVE_MASK)>>RK29_CAM_RESETACTIVE_BITPOS));\r
+\r
+                       dprintk("%s....reset pin(%d) init success(0x%x)\n",__FUNCTION__,camera_reset,((camera_ioflag&RK29_CAM_RESETACTIVE_MASK)>>RK29_CAM_RESETACTIVE_BITPOS));\r
+\r
+        }\r
+\r
+               if (camera_powerdown != INVALID_GPIO) {\r
+            ret = gpio_request(camera_powerdown, "camera powerdown");\r
+            if (ret) {\r
+                for (j=0; j<i; j++) {\r
+                    if (camera_powerdown == plat_data->gpio_res[j].gpio_powerdown) {                        \r
+                        break;\r
+                    }\r
+                }\r
+                if (i==j) {\r
+                    printk(KERN_ERR"rk_cam_io: %s..%s..powerdown pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_powerdown);\r
+                    goto sensor_io_init_erro;\r
+                }\r
+                printk("%s..%s..powerdown pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_powerdown);\r
+                goto sensor_io_init_erro;\r
+            }\r
+\r
+            if (rk_camera_platform_data.iomux(camera_powerdown) < 0) {\r
+                printk(KERN_ERR "rk_cam_io: %s..%s..powerdown pin(%d) iomux init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_powerdown);\r
+                goto sensor_io_init_erro;\r
+            }\r
+            \r
+                       plat_data->gpio_res[i].gpio_init |= RK29_CAM_POWERDNACTIVE_MASK;\r
+            gpio_set_value(camera_powerdown, ((camera_ioflag&RK29_CAM_POWERDNACTIVE_MASK)>>RK29_CAM_POWERDNACTIVE_BITPOS));\r
+            gpio_direction_output(camera_powerdown, ((camera_ioflag&RK29_CAM_POWERDNACTIVE_MASK)>>RK29_CAM_POWERDNACTIVE_BITPOS));\r
+\r
+                       dprintk("%s....powerdown pin(%d) init success(0x%x) \n",__FUNCTION__,camera_powerdown,((camera_ioflag&RK29_CAM_POWERDNACTIVE_BITPOS)>>RK29_CAM_POWERDNACTIVE_BITPOS));\r
+\r
+        }\r
+\r
+               if (camera_flash != INVALID_GPIO) {\r
+            ret = gpio_request(camera_flash, "camera flash");\r
+            if (ret) {\r
+                for (j=0; j<i; j++) {\r
+                    if (camera_flash == plat_data->gpio_res[j].gpio_flash) {                        \r
+                        break;\r
+                    }\r
+                }\r
+                if (i==j) {\r
+                    printk(KERN_ERR"rk_cam_io: %s..%s..flash pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_flash);\r
+                    goto sensor_io_init_erro;\r
+                }\r
+                printk("%s..%s..flash pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_flash);\r
+                               goto sensor_io_init_erro;\r
+            }\r
+\r
+            if (rk_camera_platform_data.iomux(camera_flash) < 0) {\r
+                printk(KERN_ERR "rk_cam_io: %s..%s..flash pin(%d) iomux init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_flash);                \r
+            }\r
+            \r
+                       plat_data->gpio_res[i].gpio_init |= RK29_CAM_FLASHACTIVE_MASK;\r
+            gpio_set_value(camera_flash, ((~camera_ioflag&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));    /* falsh off */\r
+            gpio_direction_output(camera_flash, ((~camera_ioflag&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));\r
+\r
+                       dprintk("%s....flash pin(%d) init success(0x%x) \n",__FUNCTION__,camera_flash,((camera_ioflag&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));\r
+\r
+        }  \r
+\r
+        \r
+        for (j=0; j<10; j++) {\r
+            memset(&plat_data->info[i].fival[j],0x00,sizeof(struct v4l2_frmivalenum));\r
+\r
+            if (j==0) {\r
+                plat_data->info[i].fival[j].width = 176;\r
+                plat_data->info[i].fival[j].height = 144;\r
+            } else if (j==1) {\r
+                plat_data->info[i].fival[j].width = 320;\r
+                plat_data->info[i].fival[j].height = 240;\r
+            } else if (j==2) {\r
+                plat_data->info[i].fival[j].width = 352;\r
+                plat_data->info[i].fival[j].height = 288;\r
+            } else if (j==3) {\r
+                plat_data->info[i].fival[j].width = 640;\r
+                plat_data->info[i].fival[j].height = 480;\r
+            } else if (j==4) {\r
+                plat_data->info[i].fival[j].width = 720;\r
+                plat_data->info[i].fival[j].height = 480;\r
+            } else if (j==5) {\r
+                plat_data->info[i].fival[j].width = 1280;\r
+                plat_data->info[i].fival[j].height = 720;\r
+            } else if (j==6) {\r
+                plat_data->info[i].fival[j].width = 240;\r
+                plat_data->info[i].fival[j].height = 160;\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
+                plat_data->info[i].fival[j].discrete.numerator= 1000;\r
+                plat_data->info[i].fival[j].index = 0;\r
+                plat_data->info[i].fival[j].pixel_format = V4L2_PIX_FMT_NV12;\r
+                plat_data->info[i].fival[j].type = V4L2_FRMIVAL_TYPE_DISCRETE;\r
+            }\r
+        }\r
+        \r
+       continue;\r
+sensor_io_init_erro:\r
+               rk_sensor_io_deinit(i);\r
+       }\r
+       return 0;\r
+}\r
+\r
+static int rk_sensor_io_deinit(int sensor)\r
+{\r
+    unsigned int camera_reset = INVALID_GPIO, camera_power = INVALID_GPIO;\r
+       unsigned int camera_powerdown = INVALID_GPIO, camera_flash = INVALID_GPIO;\r
+       struct rk29camera_platform_data* plat_data = &rk_camera_platform_data;\r
+    \r
+    camera_reset = plat_data->gpio_res[sensor].gpio_reset;\r
+    camera_power = plat_data->gpio_res[sensor].gpio_power;\r
+       camera_powerdown = plat_data->gpio_res[sensor].gpio_powerdown;\r
+    camera_flash = plat_data->gpio_res[sensor].gpio_flash;\r
+\r
+       if (plat_data->gpio_res[sensor].gpio_init & RK29_CAM_POWERACTIVE_MASK) {\r
+           if (camera_power != INVALID_GPIO) {\r
+               gpio_direction_input(camera_power);\r
+               gpio_free(camera_power);\r
+           }\r
+       }\r
+\r
+       if (plat_data->gpio_res[sensor].gpio_init & RK29_CAM_RESETACTIVE_MASK) {\r
+           if (camera_reset != INVALID_GPIO)  {\r
+               gpio_direction_input(camera_reset);\r
+               gpio_free(camera_reset);\r
+           }\r
+       }\r
+\r
+       if (plat_data->gpio_res[sensor].gpio_init & RK29_CAM_POWERDNACTIVE_MASK) {\r
+           if (camera_powerdown != INVALID_GPIO)  {\r
+               gpio_direction_input(camera_powerdown);\r
+               gpio_free(camera_powerdown);\r
+           }\r
+       }\r
+\r
+       if (plat_data->gpio_res[sensor].gpio_init & RK29_CAM_FLASHACTIVE_MASK) {\r
+           if (camera_flash != INVALID_GPIO)  {\r
+               gpio_direction_input(camera_flash);\r
+               gpio_free(camera_flash);\r
+           }\r
+       }\r
+       plat_data->gpio_res[sensor].gpio_init = 0;\r
+       \r
+    return 0;\r
+}\r
+static int rk_sensor_ioctrl(struct device *dev,enum rk29camera_ioctrl_cmd cmd, int on)\r
+{\r
+    struct rk29camera_gpio_res *res = NULL;    \r
+       int ret = RK29_CAM_IO_SUCCESS,i = 0;\r
+\r
+       struct rk29camera_platform_data* plat_data = &rk_camera_platform_data;\r
+       //for test reg\r
+       for(i = 0;i < RK_CAM_NUM;i++){\r
+               if(plat_data->gpio_res[i].dev_name &&  (strcmp(plat_data->gpio_res[i].dev_name, dev_name(dev)) == 0)) {\r
+                       res = (struct rk29camera_gpio_res *)&plat_data->gpio_res[i];\r
+                       break;\r
+           } \r
+    } \r
+    \r
+    if (res == NULL) {\r
+        printk(KERN_ERR "rk_cam_io: %s is not regisiterd in rk29_camera_platform_data!!\n",dev_name(dev));\r
+        ret = RK29_CAM_EIO_INVALID;\r
+        goto rk_sensor_ioctrl_end;\r
+    }\r
+       \r
+       switch (cmd)\r
+       {\r
+               case Cam_Power:\r
+               {\r
+                       if (sensor_ioctl_cb.sensor_power_cb) {\r
+                ret = sensor_ioctl_cb.sensor_power_cb(res, on);\r
+                       } else {\r
+                printk(KERN_ERR "sensor_ioctl_cb.sensor_power_cb is NULL");\r
+                WARN_ON(1);\r
+                       }\r
+                       break;\r
+               }\r
+               case Cam_Reset:\r
+               {\r
+                       if (sensor_ioctl_cb.sensor_reset_cb) {\r
+                ret = sensor_ioctl_cb.sensor_reset_cb(res, on);\r
+                       } else {\r
+                printk(KERN_ERR "sensor_ioctl_cb.sensor_reset_cb is NULL");\r
+                WARN_ON(1);\r
+                       }\r
+                       break;\r
+               }\r
+\r
+               case Cam_PowerDown:\r
+               {\r
+                       if (sensor_ioctl_cb.sensor_powerdown_cb) {\r
+                ret = sensor_ioctl_cb.sensor_powerdown_cb(res, on);\r
+                       } else {\r
+                printk(KERN_ERR "sensor_ioctl_cb.sensor_powerdown_cb is NULL");\r
+                WARN_ON(1);\r
+                       }\r
+                       break;\r
+               }\r
+\r
+               case Cam_Flash:\r
+               {\r
+                       if (sensor_ioctl_cb.sensor_flash_cb) {\r
+                ret = sensor_ioctl_cb.sensor_flash_cb(res, on);\r
+                       } else {\r
+                printk(KERN_ERR "sensor_ioctl_cb.sensor_flash_cb is NULL!");\r
+                WARN_ON(1);\r
+                       }\r
+                       break;\r
+               }\r
+               default:\r
+               {\r
+                       printk("%s cmd(0x%x) is unknown!\n",__FUNCTION__, cmd);\r
+                       break;\r
+               }\r
+       }\r
+rk_sensor_ioctrl_end:\r
+    return ret;\r
+}\r
+static int rk_sensor_power(struct device *dev, int on)\r
+{\r
+    if (!on)                        /* ddl@rock-chips.com : Ensure sensor enter standby or power off */\r
+        rk_sensor_powerdown(dev,1);\r
+       rk_sensor_ioctrl(dev,Cam_Power,on);\r
+    return 0;\r
+}\r
+#if (CONFIG_SENSOR_RESET_PIN_0 != INVALID_GPIO) || (CONFIG_SENSOR_RESET_PIN_1 != INVALID_GPIO)\r
+static int rk_sensor_reset(struct device *dev)\r
+{\r
+       rk_sensor_ioctrl(dev,Cam_Reset,1);\r
+       msleep(2);\r
+       rk_sensor_ioctrl(dev,Cam_Reset,0);\r
+       return 0;\r
+}\r
+#endif\r
+static int rk_sensor_powerdown(struct device *dev, int on)\r
+{\r
+       return rk_sensor_ioctrl(dev,Cam_PowerDown,on);\r
+}\r
+\r
+#ifdef PMEM_CAM_BASE\r
+static struct android_pmem_platform_data android_pmem_cam_pdata = {\r
+       .name           = "pmem_cam",\r
+       .start          = PMEM_CAM_BASE,\r
+       .size           = PMEM_CAM_SIZE,\r
+       .no_allocator   = 1,\r
+       .cached         = 1,\r
+};\r
+\r
+static struct platform_device android_pmem_cam_device = {\r
+       .name           = "android_pmem",\r
+       .id             = 1,\r
+       .dev            = {\r
+               .platform_data = &android_pmem_cam_pdata,\r
+       },\r
+};\r
+#endif\r
+\r
+#endif\r
+\r
index aba638bf97ca08242c31f6be40be305dc38bc5d2..b3af156144b6701ab1c7db05ed01488386a95a44 100755 (executable)
@@ -1186,7 +1186,7 @@ config VIDEO_RK29_DIGITALZOOM_IPP_OFF
 endchoice
 
 choice
-       prompt "RK29XX camera memory "
+       prompt "RKXX camera memory "
        depends on VIDEO_RK29 
        default VIDEO_RK29_CAMMEM_PMEM
        ---help---
@@ -1198,6 +1198,19 @@ config VIDEO_RK29_CAMMEM_ION
        bool "Camera memory from ion"
 endchoice
 
+choice
+       prompt "RKXX CIF work simultaneity"
+       depends on VIDEO_RK29
+       default VIDEO_RKCIF_WORK_SIMUL_OFF
+       ---help---
+               where camera memory which is used for preview/raw/jpeg in android camera hal is alloced 
+config VIDEO_RKCIF_WORK_SIMUL_ON
+       bool "Two cif controller can work sumultaneity"
+
+config VIDEO_RKCIF_WORK_SIMUL_OFF
+       bool "Two cif controller cann't work sumultaneity"
+endchoice
+
 config VIDEO_MX2_HOSTSUPPORT
        bool
 
index 9fbd3037d1641f958d47401d2e5be05aa294bf4a..e8cf5d2ecca1bdca7ae26a55c04b441ee18768b3 100755 (executable)
 #include <mach/rk29_camera.h> \r
 #include <mach/iomux.h>\r
-#ifndef PMEM_CAM_SIZE\r
-#ifdef CONFIG_VIDEO_RK29 \r
-/*---------------- Camera Sensor Fixed Macro Begin  ------------------------*/\r
-// Below Macro is fixed, programer don't change it!!!!!!\r
-#define _CONS(a,b) a##b\r
-#define CONS(a,b) _CONS(a,b)\r
-\r
-#define __STR(x) #x\r
-#define _STR(x) __STR(x)\r
-#define STR(x) _STR(x)\r
-\r
-#if (CONFIG_SENSOR_IIC_ADDR_0 != 0x00)\r
-#define PMEM_SENSOR_FULL_RESOLUTION_0  CONS(CONFIG_SENSOR_0,_FULL_RESOLUTION)\r
-#if !(PMEM_SENSOR_FULL_RESOLUTION_0)\r
-#undef PMEM_SENSOR_FULL_RESOLUTION_0\r
-#define PMEM_SENSOR_FULL_RESOLUTION_0  0x500000\r
-#endif\r
-#else\r
-#define PMEM_SENSOR_FULL_RESOLUTION_0  0x00\r
-#endif\r
\r
-#if (CONFIG_SENSOR_IIC_ADDR_1 != 0x00)\r
-#define PMEM_SENSOR_FULL_RESOLUTION_1  CONS(CONFIG_SENSOR_1,_FULL_RESOLUTION)\r
-#if !(PMEM_SENSOR_FULL_RESOLUTION_1)\r
-#undef PMEM_SENSOR_FULL_RESOLUTION_1\r
-#define PMEM_SENSOR_FULL_RESOLUTION_1  0x500000\r
-#endif\r
-#else\r
-#define PMEM_SENSOR_FULL_RESOLUTION_1  0x00\r
-#endif\r
-\r
-#if (PMEM_SENSOR_FULL_RESOLUTION_0 > PMEM_SENSOR_FULL_RESOLUTION_1)\r
-#define PMEM_CAM_FULL_RESOLUTION   PMEM_SENSOR_FULL_RESOLUTION_0\r
-#else\r
-#define PMEM_CAM_FULL_RESOLUTION   PMEM_SENSOR_FULL_RESOLUTION_1\r
-#endif\r
 \r
-#if (PMEM_CAM_FULL_RESOLUTION == 0x500000)\r
-#define PMEM_CAM_NECESSARY   0x1400000       /* 1280*720*1.5*4(preview) + 7.5M(capture raw) + 4M(jpeg encode output) */\r
-#define PMEM_CAMIPP_NECESSARY    0x800000\r
-#elif (PMEM_CAM_FULL_RESOLUTION == 0x300000)\r
-#define PMEM_CAM_NECESSARY   0xe00000        /* 1280*720*1.5*4(preview) + 4.5M(capture raw) + 3M(jpeg encode output) */\r
-#define PMEM_CAMIPP_NECESSARY    0x600000\r
-#elif (PMEM_CAM_FULL_RESOLUTION == 0x200000) /* 1280*720*1.5*4(preview) + 3M(capture raw) + 3M(jpeg encode output) */\r
-#define PMEM_CAM_NECESSARY   0xc00000\r
-#define PMEM_CAMIPP_NECESSARY    0x600000\r
-#elif ((PMEM_CAM_FULL_RESOLUTION == 0x100000) || (PMEM_CAM_FULL_RESOLUTION == 0x130000))\r
-#define PMEM_CAM_NECESSARY   0x800000        /* 800*600*1.5*4(preview) + 2M(capture raw) + 2M(jpeg encode output) */\r
-#define PMEM_CAMIPP_NECESSARY    0x400000\r
-#elif (PMEM_CAM_FULL_RESOLUTION == 0x30000)\r
-#define PMEM_CAM_NECESSARY   0x400000        /* 640*480*1.5*4(preview) + 1M(capture raw) + 1M(jpeg encode output) */\r
-#define PMEM_CAMIPP_NECESSARY    0x400000\r
+#ifndef PMEM_CAM_SIZE\r
+#include "../../../arch/arm/plat-rk/rk_camera.c"\r
 #else\r
-#define PMEM_CAM_NECESSARY   0x1200000\r
-#define PMEM_CAMIPP_NECESSARY    0x800000\r
-#endif\r
-\r
-#ifdef CONFIG_VIDEO_RK29_CAMMEM_ION\r
-#undef PMEM_CAM_NECESSARY\r
-#define PMEM_CAM_NECESSARY   0x00000000\r
-#endif\r
-\r
-/*---------------- Camera Sensor Fixed Macro End  ------------------------*/\r
-#else   //#ifdef CONFIG_VIDEO_RK29 \r
-#define PMEM_CAM_NECESSARY   0x00000000\r
-#endif\r
-#else   // #ifdef PMEM_CAM_SIZE\r
 \r
 /*****************************************************************************************\r
  * camera  devices\r
  * author: ddl@rock-chips.com\r
  *****************************************************************************************/\r
 #ifdef CONFIG_VIDEO_RK29 \r
-static int camera_debug;\r
-module_param(camera_debug, int, S_IRUGO|S_IWUSR|S_IWGRP);\r
-\r
-#define ddprintk(level, fmt, arg...) do {                      \\r
-       if (camera_debug >= level)                                      \\r
-           printk(KERN_WARNING"rk29_cam_io: " fmt , ## arg); } while (0)\r
-\r
-#define dprintk(format, ...) ddprintk(1, format, ## __VA_ARGS__)    \r
-\r
-#define SENSOR_NAME_0 STR(CONFIG_SENSOR_0)                     /* back camera sensor 0 */\r
-#define SENSOR_DEVICE_NAME_0  STR(CONS(CONFIG_SENSOR_0, _back))\r
-#ifdef CONFIG_SENSOR_01\r
-#define SENSOR_NAME_01 STR(CONFIG_SENSOR_01)                   /* back camera sensor 1 */\r
-#define SENSOR_DEVICE_NAME_01  STR(CONS(CONFIG_SENSOR_01, _back_1))\r
-#endif\r
-#ifdef CONFIG_SENSOR_02\r
-#define SENSOR_NAME_02 STR(CONFIG_SENSOR_02)                   /* back camera sensor 2 */\r
-#define SENSOR_DEVICE_NAME_02  STR(CONS(CONFIG_SENSOR_02, _back_2))\r
-#endif\r
-#define SENSOR_NAME_1 STR(CONFIG_SENSOR_1)                     /* front camera sensor 0 */\r
-#define SENSOR_DEVICE_NAME_1  STR(CONS(CONFIG_SENSOR_1, _front))\r
-#ifdef CONFIG_SENSOR_11\r
-#define SENSOR_NAME_11 STR(CONFIG_SENSOR_11)                   /* front camera sensor 1 */\r
-#define SENSOR_DEVICE_NAME_11  STR(CONS(CONFIG_SENSOR_11, _front_1))\r
-#endif\r
-#ifdef CONFIG_SENSOR_12\r
-#define SENSOR_NAME_12 STR(CONFIG_SENSOR_12)                   /* front camera sensor 2 */\r
-#define SENSOR_DEVICE_NAME_12  STR(CONS(CONFIG_SENSOR_12, _front_2))\r
-#endif\r
-\r
-\r
-static int rk29_sensor_io_init(void);\r
-static int rk29_sensor_io_deinit(int sensor);\r
-static int rk29_sensor_ioctrl(struct device *dev,enum rk29camera_ioctrl_cmd cmd,int on);\r
-\r
-static struct rk29camera_platform_data rk29_camera_platform_data = {\r
-    .io_init = rk29_sensor_io_init,\r
-    .io_deinit = rk29_sensor_io_deinit,\r
-    .sensor_ioctrl = rk29_sensor_ioctrl,\r
-    .gpio_res = {\r
-        {\r
-            .gpio_reset = CONFIG_SENSOR_RESET_PIN_0,\r
-            .gpio_power = CONFIG_SENSOR_POWER_PIN_0,\r
-            .gpio_powerdown = CONFIG_SENSOR_POWERDN_PIN_0,\r
-            .gpio_flash = CONFIG_SENSOR_FALSH_PIN_0,\r
-            .gpio_flag = (CONFIG_SENSOR_POWERACTIVE_LEVEL_0|CONFIG_SENSOR_RESETACTIVE_LEVEL_0|CONFIG_SENSOR_POWERDNACTIVE_LEVEL_0|CONFIG_SENSOR_FLASHACTIVE_LEVEL_0),\r
-            .gpio_init = 0,            \r
-            .dev_name = SENSOR_DEVICE_NAME_0,        \r
-        }, {\r
-        #ifdef CONFIG_SENSOR_01\r
-            .gpio_reset = CONFIG_SENSOR_RESET_PIN_01,\r
-            .gpio_power = CONFIG_SENSOR_POWER_PIN_01,\r
-            .gpio_powerdown = CONFIG_SENSOR_POWERDN_PIN_01,\r
-            .gpio_flash = CONFIG_SENSOR_FALSH_PIN_01,\r
-            .gpio_flag = (CONFIG_SENSOR_POWERACTIVE_LEVEL_01|CONFIG_SENSOR_RESETACTIVE_LEVEL_01|CONFIG_SENSOR_POWERDNACTIVE_LEVEL_01|CONFIG_SENSOR_FLASHACTIVE_LEVEL_01),\r
-            .gpio_init = 0,            \r
-            .dev_name = SENSOR_DEVICE_NAME_01,\r
-        #else\r
-            .gpio_reset = INVALID_GPIO,\r
-            .gpio_power = INVALID_GPIO,\r
-            .gpio_powerdown = INVALID_GPIO,\r
-            .gpio_flash = INVALID_GPIO,\r
-            .gpio_flag = 0,\r
-            .gpio_init = 0,            \r
-            .dev_name = NULL,\r
-        #endif\r
-        }, {\r
-        #ifdef CONFIG_SENSOR_02\r
-            .gpio_reset = CONFIG_SENSOR_RESET_PIN_02,\r
-            .gpio_power = CONFIG_SENSOR_POWER_PIN_02,\r
-            .gpio_powerdown = CONFIG_SENSOR_POWERDN_PIN_02,\r
-            .gpio_flash = CONFIG_SENSOR_FALSH_PIN_02,\r
-            .gpio_flag = (CONFIG_SENSOR_POWERACTIVE_LEVEL_02|CONFIG_SENSOR_RESETACTIVE_LEVEL_02|CONFIG_SENSOR_POWERDNACTIVE_LEVEL_02|CONFIG_SENSOR_FLASHACTIVE_LEVEL_02),\r
-            .gpio_init = 0,            \r
-            .dev_name = SENSOR_DEVICE_NAME_02, \r
-        #else\r
-            .gpio_reset = INVALID_GPIO,\r
-            .gpio_power = INVALID_GPIO,\r
-            .gpio_powerdown = INVALID_GPIO,\r
-            .gpio_flash = INVALID_GPIO,\r
-            .gpio_flag = 0,\r
-            .gpio_init = 0,            \r
-            .dev_name = NULL,\r
-        #endif\r
-        }, {\r
-            .gpio_reset = CONFIG_SENSOR_RESET_PIN_1,\r
-            .gpio_power = CONFIG_SENSOR_POWER_PIN_1,\r
-            .gpio_powerdown = CONFIG_SENSOR_POWERDN_PIN_1,\r
-            .gpio_flash = CONFIG_SENSOR_FALSH_PIN_1,\r
-            .gpio_flag = (CONFIG_SENSOR_POWERACTIVE_LEVEL_1|CONFIG_SENSOR_RESETACTIVE_LEVEL_1|CONFIG_SENSOR_POWERDNACTIVE_LEVEL_1|CONFIG_SENSOR_FLASHACTIVE_LEVEL_1),\r
-            .gpio_init = 0,\r
-            .dev_name = SENSOR_DEVICE_NAME_1,\r
-        },{\r
-        #ifdef CONFIG_SENSOR_11\r
-            .gpio_reset = CONFIG_SENSOR_RESET_PIN_11,\r
-            .gpio_power = CONFIG_SENSOR_POWER_PIN_11,\r
-            .gpio_powerdown = CONFIG_SENSOR_POWERDN_PIN_11,\r
-            .gpio_flash = CONFIG_SENSOR_FALSH_PIN_11,\r
-            .gpio_flag = (CONFIG_SENSOR_POWERACTIVE_LEVEL_11|CONFIG_SENSOR_RESETACTIVE_LEVEL_11|CONFIG_SENSOR_POWERDNACTIVE_LEVEL_11|CONFIG_SENSOR_FLASHACTIVE_LEVEL_11),\r
-            .gpio_init = 0,\r
-            .dev_name = SENSOR_DEVICE_NAME_11,\r
-        #else\r
-            .gpio_reset = INVALID_GPIO,\r
-            .gpio_power = INVALID_GPIO,\r
-            .gpio_powerdown = INVALID_GPIO,\r
-            .gpio_flash = INVALID_GPIO,\r
-            .gpio_flag = 0,\r
-            .gpio_init = 0,            \r
-            .dev_name = NULL,\r
-        #endif        \r
-        }, {\r
-        #ifdef CONFIG_SENSOR_12\r
-            .gpio_reset = CONFIG_SENSOR_RESET_PIN_12,\r
-            .gpio_power = CONFIG_SENSOR_POWER_PIN_12,\r
-            .gpio_powerdown = CONFIG_SENSOR_POWERDN_PIN_12,\r
-            .gpio_flash = CONFIG_SENSOR_FALSH_PIN_12,\r
-            .gpio_flag = (CONFIG_SENSOR_POWERACTIVE_LEVEL_12|CONFIG_SENSOR_RESETACTIVE_LEVEL_12|CONFIG_SENSOR_POWERDNACTIVE_LEVEL_12|CONFIG_SENSOR_FLASHACTIVE_LEVEL_12),\r
-            .gpio_init = 0,\r
-            .dev_name = SENSOR_DEVICE_NAME_12,\r
-        #else\r
-            .gpio_reset = INVALID_GPIO,\r
-            .gpio_power = INVALID_GPIO,\r
-            .gpio_powerdown = INVALID_GPIO,\r
-            .gpio_flash = INVALID_GPIO,\r
-            .gpio_flag = 0,\r
-            .gpio_init = 0,            \r
-            .dev_name = NULL,\r
-        #endif\r
-        }\r
-    },\r
-       #ifdef CONFIG_VIDEO_RK29_WORK_IPP\r
-       .meminfo = {\r
-           .name  = "camera_ipp_mem",\r
-               .start = MEM_CAMIPP_BASE,\r
-               .size   = MEM_CAMIPP_SIZE,\r
-       },\r
-       #endif\r
-    .info = {\r
-        {\r
-            .dev_name = SENSOR_DEVICE_NAME_0,\r
-            .orientation = CONFIG_SENSOR_ORIENTATION_0,  \r
-        #ifdef CONFIG_SENSOR_01\r
-           },{\r
-               .dev_name = SENSOR_DEVICE_NAME_01,\r
-            .orientation = CONFIG_SENSOR_ORIENTATION_01, \r
-        #else\r
-        },{\r
-               .dev_name = NULL,\r
-            .orientation = 0x00, \r
-        #endif\r
-        #ifdef CONFIG_SENSOR_02\r
-           },{\r
-               .dev_name = SENSOR_DEVICE_NAME_02,\r
-            .orientation = CONFIG_SENSOR_ORIENTATION_02, \r
-        #else\r
-        },{\r
-               .dev_name = NULL,\r
-            .orientation = 0x00, \r
-        #endif\r
-        },{\r
-            .dev_name = SENSOR_DEVICE_NAME_1,\r
-            .orientation = CONFIG_SENSOR_ORIENTATION_1,\r
-        #ifdef CONFIG_SENSOR_11 \r
-        },{\r
-            .dev_name = SENSOR_DEVICE_NAME_11,\r
-            .orientation = CONFIG_SENSOR_ORIENTATION_11, \r
-        #else\r
-        },{\r
-               .dev_name = NULL,\r
-            .orientation = 0x00, \r
-        #endif\r
-        #ifdef CONFIG_SENSOR_12\r
-           },{\r
-               .dev_name = SENSOR_DEVICE_NAME_12,\r
-            .orientation = CONFIG_SENSOR_ORIENTATION_12, \r
-        #else\r
-        },{\r
-               .dev_name = NULL,\r
-            .orientation = 0x00, \r
-        #endif\r
-           }\r
-       }\r
-};\r
-\r
-static int rk29_sensor_iomux(int pin)\r
+static int rk_sensor_iomux(int pin)\r
 {    \r
     switch (pin)\r
     {\r
@@ -1221,651 +974,7 @@ static int rk29_sensor_iomux(int pin)
     }\r
     return 0;\r
 }\r
-\r
-static int sensor_power_default_cb (struct rk29camera_gpio_res *res, int on)\r
-{\r
-    int camera_power = res->gpio_power;\r
-    int camera_ioflag = res->gpio_flag;\r
-    int camera_io_init = res->gpio_init;\r
-    int ret = 0;\r
-    \r
-    if (camera_power != INVALID_GPIO)  {\r
-               if (camera_io_init & RK29_CAM_POWERACTIVE_MASK) {\r
-            if (on) {\r
-               gpio_set_value(camera_power, ((camera_ioflag&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
-                       dprintk("%s..%s..PowerPin=%d ..PinLevel = %x   \n",__FUNCTION__,res->dev_name, camera_power, ((camera_ioflag&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
-                       msleep(10);\r
-               } else {\r
-                       gpio_set_value(camera_power, (((~camera_ioflag)&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
-                       dprintk("%s..%s..PowerPin=%d ..PinLevel = %x   \n",__FUNCTION__,res->dev_name, camera_power, (((~camera_ioflag)&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
-               }\r
-               } else {\r
-                       ret = RK29_CAM_EIO_REQUESTFAIL;\r
-                       printk("%s..%s..PowerPin=%d request failed!\n",__FUNCTION__,res->dev_name,camera_power);\r
-           }        \r
-    } else {\r
-               ret = RK29_CAM_EIO_INVALID;\r
-    } \r
-\r
-    return ret;\r
-}\r
-\r
-static int sensor_reset_default_cb (struct rk29camera_gpio_res *res, int on)\r
-{\r
-    int camera_reset = res->gpio_reset;\r
-    int camera_ioflag = res->gpio_flag;\r
-    int camera_io_init = res->gpio_init;  \r
-    int ret = 0;\r
-    \r
-    if (camera_reset != INVALID_GPIO) {\r
-               if (camera_io_init & RK29_CAM_RESETACTIVE_MASK) {\r
-                       if (on) {\r
-                       gpio_set_value(camera_reset, ((camera_ioflag&RK29_CAM_RESETACTIVE_MASK)>>RK29_CAM_RESETACTIVE_BITPOS));\r
-                       dprintk("%s..%s..ResetPin=%d ..PinLevel = %x \n",__FUNCTION__,res->dev_name,camera_reset, ((camera_ioflag&RK29_CAM_RESETACTIVE_MASK)>>RK29_CAM_RESETACTIVE_BITPOS));\r
-                       } else {\r
-                               gpio_set_value(camera_reset,(((~camera_ioflag)&RK29_CAM_RESETACTIVE_MASK)>>RK29_CAM_RESETACTIVE_BITPOS));\r
-                       dprintk("%s..%s..ResetPin= %d..PinLevel = %x   \n",__FUNCTION__,res->dev_name, camera_reset, (((~camera_ioflag)&RK29_CAM_RESETACTIVE_MASK)>>RK29_CAM_RESETACTIVE_BITPOS));\r
-               }\r
-               } else {\r
-                       ret = RK29_CAM_EIO_REQUESTFAIL;\r
-                       printk("%s..%s..ResetPin=%d request failed!\n",__FUNCTION__,res->dev_name,camera_reset);\r
-               }\r
-    } else {\r
-               ret = RK29_CAM_EIO_INVALID;\r
-    }\r
-\r
-    return ret;\r
-}\r
-\r
-static int sensor_powerdown_default_cb (struct rk29camera_gpio_res *res, int on)\r
-{\r
-    int camera_powerdown = res->gpio_powerdown;\r
-    int camera_ioflag = res->gpio_flag;\r
-    int camera_io_init = res->gpio_init;  \r
-    int ret = 0;    \r
-\r
-    if (camera_powerdown != INVALID_GPIO) {\r
-               if (camera_io_init & RK29_CAM_POWERDNACTIVE_MASK) {\r
-                       if (on) {\r
-                       gpio_set_value(camera_powerdown, ((camera_ioflag&RK29_CAM_POWERDNACTIVE_MASK)>>RK29_CAM_POWERDNACTIVE_BITPOS));\r
-                       dprintk("%s..%s..PowerDownPin=%d ..PinLevel = %x \n",__FUNCTION__,res->dev_name,camera_powerdown, ((camera_ioflag&RK29_CAM_POWERDNACTIVE_MASK)>>RK29_CAM_POWERDNACTIVE_BITPOS));\r
-                       } else {\r
-                               gpio_set_value(camera_powerdown,(((~camera_ioflag)&RK29_CAM_POWERDNACTIVE_MASK)>>RK29_CAM_POWERDNACTIVE_BITPOS));\r
-                       dprintk("%s..%s..PowerDownPin= %d..PinLevel = %x   \n",__FUNCTION__,res->dev_name, camera_powerdown, (((~camera_ioflag)&RK29_CAM_POWERDNACTIVE_MASK)>>RK29_CAM_POWERDNACTIVE_BITPOS));\r
-               }\r
-               } else {\r
-                       ret = RK29_CAM_EIO_REQUESTFAIL;\r
-                       dprintk("%s..%s..PowerDownPin=%d request failed!\n",__FUNCTION__,res->dev_name,camera_powerdown);\r
-               }\r
-    } else {\r
-               ret = RK29_CAM_EIO_INVALID;\r
-    }\r
-    return ret;\r
-}\r
-\r
-\r
-static int sensor_flash_default_cb (struct rk29camera_gpio_res *res, int on)\r
-{\r
-    int camera_flash = res->gpio_flash;\r
-    int camera_ioflag = res->gpio_flag;\r
-    int camera_io_init = res->gpio_init;  \r
-    int ret = 0;    \r
-\r
-    if (camera_flash != INVALID_GPIO) {\r
-               if (camera_io_init & RK29_CAM_FLASHACTIVE_MASK) {\r
-            switch (on)\r
-            {\r
-                case Flash_Off:\r
-                {\r
-                    gpio_set_value(camera_flash,(((~camera_ioflag)&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));\r
-                           dprintk("\n%s..%s..FlashPin= %d..PinLevel = %x   \n",__FUNCTION__,res->dev_name, camera_flash, (((~camera_ioflag)&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS)); \r
-                           break;\r
-                }\r
-\r
-                case Flash_On:\r
-                {\r
-                    gpio_set_value(camera_flash, ((camera_ioflag&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));\r
-                           dprintk("%s..%s..FlashPin=%d ..PinLevel = %x \n",__FUNCTION__,res->dev_name,camera_flash, ((camera_ioflag&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));\r
-                           break;\r
-                }\r
-\r
-                case Flash_Torch:\r
-                {\r
-                    gpio_set_value(camera_flash, ((camera_ioflag&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));\r
-                           dprintk("%s..%s..FlashPin=%d ..PinLevel = %x \n",__FUNCTION__,res->dev_name,camera_flash, ((camera_ioflag&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));\r
-                           break;\r
-                }\r
-\r
-                default:\r
-                {\r
-                    printk("%s..%s..Flash command(%d) is invalidate \n",__FUNCTION__,res->dev_name,on);\r
-                    break;\r
-                }\r
-            }\r
-               } else {\r
-                       ret = RK29_CAM_EIO_REQUESTFAIL;\r
-                       printk("%s..%s..FlashPin=%d request failed!\n",__FUNCTION__,res->dev_name,camera_flash);\r
-               }\r
-    } else {\r
-               ret = RK29_CAM_EIO_INVALID;\r
-    }\r
-    return ret;\r
-}\r
-\r
-static void rk29_sensor_fps_get(int idx, unsigned int *val, int w, int h)\r
-{\r
-    switch (idx)\r
-    {\r
-        case 0:\r
-        {\r
-            if ((w==176) && (h==144)) {\r
-                *val = CONFIG_SENSOR_QCIF_FPS_FIXED_0;\r
-            #ifdef CONFIG_SENSOR_240X160_FPS_FIXED_0\r
-            } else if ((w==240) && (h==160)) {\r
-                *val = CONFIG_SENSOR_240X160_FPS_FIXED_0;\r
-            #endif\r
-            } else if ((w==320) && (h==240)) {\r
-                *val = CONFIG_SENSOR_QVGA_FPS_FIXED_0;\r
-            } else if ((w==352) && (h==288)) {\r
-                *val = CONFIG_SENSOR_CIF_FPS_FIXED_0;\r
-            } else if ((w==640) && (h==480)) {\r
-                *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==1280) && (h==720)) {\r
-                *val = CONFIG_SENSOR_720P_FPS_FIXED_0;\r
-            }\r
-            break;\r
-        }\r
-        #ifdef CONFIG_SENSOR_01\r
-        case 1:\r
-        {\r
-            if ((w==176) && (h==144)) {\r
-                *val = CONFIG_SENSOR_QCIF_FPS_FIXED_01;\r
-            #ifdef CONFIG_SENSOR_240X160_FPS_FIXED_01\r
-            } else if ((w==240) && (h==160)) {\r
-                *val = CONFIG_SENSOR_240X160_FPS_FIXED_01;\r
-            #endif\r
-            } else if ((w==320) && (h==240)) {\r
-                *val = CONFIG_SENSOR_QVGA_FPS_FIXED_01;\r
-            } else if ((w==352) && (h==288)) {\r
-                *val = CONFIG_SENSOR_CIF_FPS_FIXED_01;\r
-            } else if ((w==640) && (h==480)) {\r
-                *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==1280) && (h==720)) {\r
-                *val = CONFIG_SENSOR_720P_FPS_FIXED_01;\r
-            }\r
-            break;\r
-        }\r
-        #endif\r
-        #ifdef CONFIG_SENSOR_02\r
-        case 2:\r
-        {\r
-            if ((w==176) && (h==144)) {\r
-                *val = CONFIG_SENSOR_QCIF_FPS_FIXED_02;\r
-            #ifdef CONFIG_SENSOR_240X160_FPS_FIXED_02\r
-            } else if ((w==240) && (h==160)) {\r
-                *val = CONFIG_SENSOR_240X160_FPS_FIXED_02;\r
-            #endif\r
-            } else if ((w==320) && (h==240)) {\r
-                *val = CONFIG_SENSOR_QVGA_FPS_FIXED_02;\r
-            } else if ((w==352) && (h==288)) {\r
-                *val = CONFIG_SENSOR_CIF_FPS_FIXED_02;\r
-            } else if ((w==640) && (h==480)) {\r
-                *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==1280) && (h==720)) {\r
-                *val = CONFIG_SENSOR_720P_FPS_FIXED_02;\r
-            }\r
-            break;\r
-        }\r
-        #endif\r
-        \r
-        case 3:\r
-        {\r
-            if ((w==176) && (h==144)) {\r
-                *val = CONFIG_SENSOR_QCIF_FPS_FIXED_1;\r
-            #ifdef CONFIG_SENSOR_240X160_FPS_FIXED_1\r
-            } else if ((w==240) && (h==160)) {\r
-                *val = CONFIG_SENSOR_240X160_FPS_FIXED_1;\r
-            #endif\r
-            } else if ((w==320) && (h==240)) {\r
-                *val = CONFIG_SENSOR_QVGA_FPS_FIXED_1;\r
-            } else if ((w==352) && (h==288)) {\r
-                *val = CONFIG_SENSOR_CIF_FPS_FIXED_1;\r
-            } else if ((w==640) && (h==480)) {\r
-                *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==1280) && (h==720)) {\r
-                *val = CONFIG_SENSOR_720P_FPS_FIXED_1;\r
-            }\r
-            break;\r
-        }\r
-        #ifdef CONFIG_SENSOR_11\r
-        case 4:\r
-        {\r
-            if ((w==176) && (h==144)) {\r
-                *val = CONFIG_SENSOR_QCIF_FPS_FIXED_11;\r
-            #ifdef CONFIG_SENSOR_240X160_FPS_FIXED_11\r
-            } else if ((w==240) && (h==160)) {\r
-                *val = CONFIG_SENSOR_240X160_FPS_FIXED_11;\r
-            #endif\r
-            } else if ((w==320) && (h==240)) {\r
-                *val = CONFIG_SENSOR_QVGA_FPS_FIXED_11;\r
-            } else if ((w==352) && (h==288)) {\r
-                *val = CONFIG_SENSOR_CIF_FPS_FIXED_11;\r
-            } else if ((w==640) && (h==480)) {\r
-                *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==1280) && (h==720)) {\r
-                *val = CONFIG_SENSOR_720P_FPS_FIXED_11;\r
-            }\r
-            break;\r
-        }\r
-        #endif\r
-        #ifdef CONFIG_SENSOR_12\r
-        case 5:\r
-        {\r
-            if ((w==176) && (h==144)) {\r
-                *val = CONFIG_SENSOR_QCIF_FPS_FIXED_12;\r
-            #ifdef CONFIG_SENSOR_240X160_FPS_FIXED_12\r
-            } else if ((w==240) && (h==160)) {\r
-                *val = CONFIG_SENSOR_240X160_FPS_FIXED_12;\r
-            #endif\r
-            } else if ((w==320) && (h==240)) {\r
-                *val = CONFIG_SENSOR_QVGA_FPS_FIXED_12;\r
-            } else if ((w==352) && (h==288)) {\r
-                *val = CONFIG_SENSOR_CIF_FPS_FIXED_12;\r
-            } else if ((w==640) && (h==480)) {\r
-                *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==1280) && (h==720)) {\r
-                *val = CONFIG_SENSOR_720P_FPS_FIXED_12;\r
-            }\r
-            break;\r
-        }\r
-        #endif\r
-        default:\r
-            printk(KERN_ERR"rk29_cam_io: sensor-%d have not been define in board file!",idx);\r
-    }\r
-}\r
-static int rk29_sensor_io_init(void)\r
-{\r
-    int ret = 0, i,j;\r
-    unsigned int camera_reset = INVALID_GPIO, camera_power = INVALID_GPIO;\r
-       unsigned int camera_powerdown = INVALID_GPIO, camera_flash = INVALID_GPIO;\r
-       unsigned int camera_ioflag;\r
-\r
-    if (sensor_ioctl_cb.sensor_power_cb == NULL)\r
-        sensor_ioctl_cb.sensor_power_cb = sensor_power_default_cb;\r
-    if (sensor_ioctl_cb.sensor_reset_cb == NULL)\r
-        sensor_ioctl_cb.sensor_reset_cb = sensor_reset_default_cb;\r
-    if (sensor_ioctl_cb.sensor_powerdown_cb == NULL)\r
-        sensor_ioctl_cb.sensor_powerdown_cb = sensor_powerdown_default_cb;\r
-    if (sensor_ioctl_cb.sensor_flash_cb == NULL)\r
-        sensor_ioctl_cb.sensor_flash_cb = sensor_flash_default_cb;\r
-    \r
-    for (i=0; i<RK29_CAM_SUPPORT_NUMS; i++) {\r
-        if (rk29_camera_platform_data.gpio_res[i].dev_name == NULL)\r
-            continue;\r
-        \r
-        camera_reset = rk29_camera_platform_data.gpio_res[i].gpio_reset;\r
-        camera_power = rk29_camera_platform_data.gpio_res[i].gpio_power;\r
-               camera_powerdown = rk29_camera_platform_data.gpio_res[i].gpio_powerdown;\r
-        camera_flash = rk29_camera_platform_data.gpio_res[i].gpio_flash;\r
-               camera_ioflag = rk29_camera_platform_data.gpio_res[i].gpio_flag;\r
-               rk29_camera_platform_data.gpio_res[i].gpio_init = 0;\r
-\r
-        if (camera_power != INVALID_GPIO) {\r
-            ret = gpio_request(camera_power, "camera power");\r
-            if (ret) {\r
-                if (i == 0) {\r
-                    printk("%s..%s..power pin(%d) init failed\n",__FUNCTION__,rk29_camera_platform_data.gpio_res[i].dev_name,camera_power);\r
-                                   goto sensor_io_int_loop_end;\r
-                } else {\r
-                    for (j=0; j<i; j++) {\r
-                        if (camera_power == rk29_camera_platform_data.gpio_res[j].gpio_power)\r
-                            break;\r
-                    }\r
-                    if (i==j) {\r
-                        printk("%s..%s..power pin(%d) init failed\n",__FUNCTION__,rk29_camera_platform_data.gpio_res[i].dev_name,camera_power);\r
-                        goto sensor_io_int_loop_end;\r
-                    }\r
-                }\r
-            }\r
-\r
-            if (rk29_sensor_iomux(camera_power) < 0) {\r
-                printk(KERN_ERR "%s..%s..power pin(%d) iomux init failed\n",__FUNCTION__,rk29_camera_platform_data.gpio_res[i].dev_name,camera_power);\r
-                goto sensor_io_int_loop_end;\r
-            }\r
-            \r
-                       rk29_camera_platform_data.gpio_res[i].gpio_init |= RK29_CAM_POWERACTIVE_MASK;\r
-            gpio_set_value(camera_reset, (((~camera_ioflag)&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
-            gpio_direction_output(camera_power, (((~camera_ioflag)&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
-\r
-                       dprintk("%s....power pin(%d) init success(0x%x)  \n",__FUNCTION__,camera_power,(((~camera_ioflag)&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
-\r
-        }\r
-\r
-        if (camera_reset != INVALID_GPIO) {\r
-            ret = gpio_request(camera_reset, "camera reset");\r
-            if (ret) {\r
-                if (i==1) {\r
-                    if ((camera_reset == rk29_camera_platform_data.gpio_res[0].gpio_reset) \r
-                        || (camera_reset == rk29_camera_platform_data.gpio_res[2].gpio_reset)) {\r
-                        ret = 0;\r
-                    }\r
-                }\r
-                if (i==2) {\r
-                    if ((camera_reset == rk29_camera_platform_data.gpio_res[0].gpio_reset) \r
-                        || (camera_reset == rk29_camera_platform_data.gpio_res[1].gpio_reset)) {\r
-                        ret = 0;\r
-                    }\r
-                }\r
-                if (i==4) {\r
-                    if ((camera_reset == rk29_camera_platform_data.gpio_res[3].gpio_reset) \r
-                        || (camera_reset == rk29_camera_platform_data.gpio_res[5].gpio_reset)) {\r
-                        ret = 0;\r
-                    }\r
-                }\r
-                if (i==5) {\r
-                    if ((camera_reset == rk29_camera_platform_data.gpio_res[3].gpio_reset) \r
-                        || (camera_reset == rk29_camera_platform_data.gpio_res[4].gpio_reset)) {\r
-                        ret = 0;\r
-                    }\r
-                }\r
-                if (ret) {\r
-                    printk("%s..%s..reset pin(%d) init failed\n",__FUNCTION__,rk29_camera_platform_data.gpio_res[i].dev_name,camera_reset);\r
-                    goto sensor_io_int_loop_end;\r
-                }\r
-            }\r
-\r
-            if (rk29_sensor_iomux(camera_reset) < 0) {\r
-                printk(KERN_ERR "%s..%s..reset pin(%d) iomux init failed\n",__FUNCTION__,rk29_camera_platform_data.gpio_res[i].dev_name,camera_reset);\r
-                goto sensor_io_int_loop_end;\r
-            }\r
-            \r
-                       rk29_camera_platform_data.gpio_res[i].gpio_init |= RK29_CAM_RESETACTIVE_MASK;\r
-            gpio_set_value(camera_reset, ((camera_ioflag&RK29_CAM_RESETACTIVE_MASK)>>RK29_CAM_RESETACTIVE_BITPOS));\r
-            gpio_direction_output(camera_reset, ((camera_ioflag&RK29_CAM_RESETACTIVE_MASK)>>RK29_CAM_RESETACTIVE_BITPOS));\r
-\r
-                       dprintk("%s....reset pin(%d) init success(0x%x)\n",__FUNCTION__,camera_reset,((camera_ioflag&RK29_CAM_RESETACTIVE_MASK)>>RK29_CAM_RESETACTIVE_BITPOS));\r
-\r
-        }\r
-\r
-               if (camera_powerdown != INVALID_GPIO) {\r
-            ret = gpio_request(camera_powerdown, "camera powerdown");\r
-            if (ret) {\r
-                if (i==1) {\r
-                    if ((camera_powerdown == rk29_camera_platform_data.gpio_res[0].gpio_powerdown) \r
-                        || (camera_powerdown == rk29_camera_platform_data.gpio_res[2].gpio_powerdown)) {\r
-                        ret = 0;\r
-                    }\r
-                }\r
-                if (i==2) {\r
-                    if ((camera_powerdown == rk29_camera_platform_data.gpio_res[0].gpio_powerdown) \r
-                        || (camera_powerdown == rk29_camera_platform_data.gpio_res[1].gpio_powerdown)) {\r
-                        ret = 0;\r
-                    }\r
-                }\r
-                if (i==4) {\r
-                    if ((camera_powerdown == rk29_camera_platform_data.gpio_res[3].gpio_powerdown) \r
-                        || (camera_powerdown == rk29_camera_platform_data.gpio_res[5].gpio_powerdown)) {\r
-                        ret = 0;\r
-                    }\r
-                }\r
-                if (i==5) {\r
-                    if ((camera_powerdown == rk29_camera_platform_data.gpio_res[3].gpio_powerdown) \r
-                        || (camera_powerdown == rk29_camera_platform_data.gpio_res[4].gpio_powerdown)) {\r
-                        ret = 0;\r
-                    }\r
-                }\r
-                if (ret) {\r
-                    printk("%s..%s..powerdown pin(%d) init failed\n",__FUNCTION__,rk29_camera_platform_data.gpio_res[i].dev_name,camera_powerdown);\r
-                    goto sensor_io_int_loop_end;\r
-                }\r
-            }\r
-\r
-            if (rk29_sensor_iomux(camera_powerdown) < 0) {\r
-                printk(KERN_ERR "%s..%s..powerdown pin(%d) iomux init failed\n",__FUNCTION__,rk29_camera_platform_data.gpio_res[i].dev_name,camera_powerdown);\r
-                goto sensor_io_int_loop_end;\r
-            }\r
-            \r
-                       rk29_camera_platform_data.gpio_res[i].gpio_init |= RK29_CAM_POWERDNACTIVE_MASK;\r
-            gpio_set_value(camera_powerdown, ((camera_ioflag&RK29_CAM_POWERDNACTIVE_MASK)>>RK29_CAM_POWERDNACTIVE_BITPOS));\r
-            gpio_direction_output(camera_powerdown, ((camera_ioflag&RK29_CAM_POWERDNACTIVE_MASK)>>RK29_CAM_POWERDNACTIVE_BITPOS));\r
-\r
-                       dprintk("%s....powerdown pin(%d) init success(0x%x) \n",__FUNCTION__,camera_powerdown,((camera_ioflag&RK29_CAM_POWERDNACTIVE_BITPOS)>>RK29_CAM_POWERDNACTIVE_BITPOS));\r
-\r
-        }\r
-\r
-               if (camera_flash != INVALID_GPIO) {\r
-            ret = gpio_request(camera_flash, "camera flash");\r
-            if (ret) {\r
-                if (i==1) {\r
-                    if ((camera_flash == rk29_camera_platform_data.gpio_res[0].gpio_flash) \r
-                        || (camera_flash == rk29_camera_platform_data.gpio_res[2].gpio_flash)) {\r
-                        ret = 0;\r
-                    }\r
-                }\r
-                if (i==2) {\r
-                    if ((camera_flash == rk29_camera_platform_data.gpio_res[0].gpio_flash) \r
-                        || (camera_flash == rk29_camera_platform_data.gpio_res[1].gpio_flash)) {\r
-                        ret = 0;\r
-                    }\r
-                }\r
-                if (i==4) {\r
-                    if ((camera_flash == rk29_camera_platform_data.gpio_res[3].gpio_flash) \r
-                        || (camera_flash == rk29_camera_platform_data.gpio_res[5].gpio_flash)) {\r
-                        ret = 0;\r
-                    }\r
-                }\r
-                if (i==5) {\r
-                    if ((camera_flash == rk29_camera_platform_data.gpio_res[3].gpio_flash) \r
-                        || (camera_flash == rk29_camera_platform_data.gpio_res[4].gpio_flash)) {\r
-                        ret = 0;\r
-                    }\r
-                }\r
-                if (ret) {\r
-                    printk("%s..%s..flash pin(%d) init failed\n",__FUNCTION__,rk29_camera_platform_data.gpio_res[i].dev_name,camera_flash);\r
-                               goto sensor_io_int_loop_end;\r
-                }\r
-            }\r
-\r
-            if (rk29_sensor_iomux(camera_flash) < 0) {\r
-                printk(KERN_ERR "%s..%s..flash pin(%d) iomux init failed\n",__FUNCTION__,rk29_camera_platform_data.gpio_res[i].dev_name,camera_flash);                \r
-            }\r
-            \r
-                       rk29_camera_platform_data.gpio_res[i].gpio_init |= RK29_CAM_FLASHACTIVE_MASK;\r
-            gpio_set_value(camera_flash, ((~camera_ioflag&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));    /* falsh off */\r
-            gpio_direction_output(camera_flash, ((~camera_ioflag&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));\r
-\r
-                       dprintk("%s....flash pin(%d) init success(0x%x) \n",__FUNCTION__,camera_flash,((camera_ioflag&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));\r
-\r
-        }  \r
-\r
-        \r
-        for (j=0; j<10; j++) {\r
-            memset(&rk29_camera_platform_data.info[i].fival[j],0x00,sizeof(struct v4l2_frmivalenum));\r
-\r
-            if (j==0) {\r
-                rk29_camera_platform_data.info[i].fival[j].width = 176;\r
-                rk29_camera_platform_data.info[i].fival[j].height = 144;\r
-            } else if (j==1) {\r
-                rk29_camera_platform_data.info[i].fival[j].width = 320;\r
-                rk29_camera_platform_data.info[i].fival[j].height = 240;\r
-            } else if (j==2) {\r
-                rk29_camera_platform_data.info[i].fival[j].width = 352;\r
-                rk29_camera_platform_data.info[i].fival[j].height = 288;\r
-            } else if (j==3) {\r
-                rk29_camera_platform_data.info[i].fival[j].width = 640;\r
-                rk29_camera_platform_data.info[i].fival[j].height = 480;\r
-            } else if (j==4) {\r
-                rk29_camera_platform_data.info[i].fival[j].width = 720;\r
-                rk29_camera_platform_data.info[i].fival[j].height = 480;\r
-            } else if (j==5) {\r
-                rk29_camera_platform_data.info[i].fival[j].width = 1280;\r
-                rk29_camera_platform_data.info[i].fival[j].height = 720;\r
-            } else if (j==6) {\r
-                rk29_camera_platform_data.info[i].fival[j].width = 240;\r
-                rk29_camera_platform_data.info[i].fival[j].height = 160;\r
-            }\r
-            if (rk29_camera_platform_data.info[i].fival[j].width && rk29_camera_platform_data.info[i].fival[j].height) {\r
-                rk29_sensor_fps_get(i,&rk29_camera_platform_data.info[i].fival[j].discrete.denominator,\r
-                    rk29_camera_platform_data.info[i].fival[j].width,rk29_camera_platform_data.info[i].fival[j].height);\r
-                rk29_camera_platform_data.info[i].fival[j].discrete.numerator= 1000;\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].type = V4L2_FRMIVAL_TYPE_DISCRETE;\r
-            }\r
-        }\r
-        \r
-               continue;\r
-sensor_io_int_loop_end:\r
-               rk29_sensor_io_deinit(i);\r
-               continue;\r
-    }\r
-\r
-    return 0;\r
-}\r
-\r
-static int rk29_sensor_io_deinit(int sensor)\r
-{\r
-    unsigned int camera_reset = INVALID_GPIO, camera_power = INVALID_GPIO;\r
-       unsigned int camera_powerdown = INVALID_GPIO, camera_flash = INVALID_GPIO;\r
-\r
-    camera_reset = rk29_camera_platform_data.gpio_res[sensor].gpio_reset;\r
-    camera_power = rk29_camera_platform_data.gpio_res[sensor].gpio_power;\r
-       camera_powerdown = rk29_camera_platform_data.gpio_res[sensor].gpio_powerdown;\r
-    camera_flash = rk29_camera_platform_data.gpio_res[sensor].gpio_flash;\r
-\r
-    printk("%s..%s enter..\n",__FUNCTION__,rk29_camera_platform_data.gpio_res[sensor].dev_name);\r
-\r
-       if (rk29_camera_platform_data.gpio_res[sensor].gpio_init & RK29_CAM_POWERACTIVE_MASK) {\r
-           if (camera_power != INVALID_GPIO) {\r
-               gpio_direction_input(camera_power);\r
-               gpio_free(camera_power);\r
-           }\r
-       }\r
-\r
-       if (rk29_camera_platform_data.gpio_res[sensor].gpio_init & RK29_CAM_RESETACTIVE_MASK) {\r
-           if (camera_reset != INVALID_GPIO)  {\r
-               gpio_direction_input(camera_reset);\r
-               gpio_free(camera_reset);\r
-           }\r
-       }\r
-\r
-       if (rk29_camera_platform_data.gpio_res[sensor].gpio_init & RK29_CAM_POWERDNACTIVE_MASK) {\r
-           if (camera_powerdown != INVALID_GPIO)  {\r
-               gpio_direction_input(camera_powerdown);\r
-               gpio_free(camera_powerdown);\r
-           }\r
-       }\r
-\r
-       if (rk29_camera_platform_data.gpio_res[sensor].gpio_init & RK29_CAM_FLASHACTIVE_MASK) {\r
-           if (camera_flash != INVALID_GPIO)  {\r
-               gpio_direction_input(camera_flash);\r
-               gpio_free(camera_flash);\r
-           }\r
-       }\r
-\r
-       rk29_camera_platform_data.gpio_res[sensor].gpio_init = 0;\r
-    return 0;\r
-}\r
-static int rk29_sensor_ioctrl(struct device *dev,enum rk29camera_ioctrl_cmd cmd, int on)\r
-{\r
-    struct rk29camera_gpio_res *res = NULL;    \r
-       int ret = RK29_CAM_IO_SUCCESS,i;\r
-\r
-    for (i=0; i<RK29_CAM_SUPPORT_NUMS; i++) {\r
-        if(rk29_camera_platform_data.gpio_res[i].dev_name &&  (strcmp(rk29_camera_platform_data.gpio_res[i].dev_name, dev_name(dev)) == 0)) {\r
-               res = (struct rk29camera_gpio_res *)&rk29_camera_platform_data.gpio_res[i];\r
-        } \r
-    }\r
-    if (res == NULL) {\r
-        printk(KERN_ERR "%s is not regisiterd in rk29_camera_platform_data!!\n",dev_name(dev));\r
-        ret = RK29_CAM_EIO_INVALID;\r
-        goto rk29_sensor_ioctrl_end;\r
-    }\r
-\r
-       switch (cmd)\r
-       {\r
-               case Cam_Power:\r
-               {\r
-                       if (sensor_ioctl_cb.sensor_power_cb) {\r
-                ret = sensor_ioctl_cb.sensor_power_cb(res, on);\r
-                       } else {\r
-                printk(KERN_ERR "sensor_ioctl_cb.sensor_power_cb is NULL");\r
-                WARN_ON(1);\r
-                       }\r
-                       break;\r
-               }\r
-               case Cam_Reset:\r
-               {\r
-                       if (sensor_ioctl_cb.sensor_reset_cb) {\r
-                ret = sensor_ioctl_cb.sensor_reset_cb(res, on);\r
-                       } else {\r
-                printk(KERN_ERR "sensor_ioctl_cb.sensor_reset_cb is NULL");\r
-                WARN_ON(1);\r
-                       }\r
-                       break;\r
-               }\r
-\r
-               case Cam_PowerDown:\r
-               {\r
-                       if (sensor_ioctl_cb.sensor_powerdown_cb) {\r
-                ret = sensor_ioctl_cb.sensor_powerdown_cb(res, on);\r
-                       } else {\r
-                printk(KERN_ERR "sensor_ioctl_cb.sensor_powerdown_cb is NULL");\r
-                WARN_ON(1);\r
-                       }\r
-                       break;\r
-               }\r
-\r
-               case Cam_Flash:\r
-               {\r
-                       if (sensor_ioctl_cb.sensor_flash_cb) {\r
-                ret = sensor_ioctl_cb.sensor_flash_cb(res, on);\r
-                       } else {\r
-                printk(KERN_ERR "sensor_ioctl_cb.sensor_flash_cb is NULL!");\r
-                WARN_ON(1);\r
-                       }\r
-                       break;\r
-               }\r
-               default:\r
-               {\r
-                       printk("%s cmd(0x%x) is unknown!\n",__FUNCTION__, cmd);\r
-                       break;\r
-               }\r
-       }\r
-rk29_sensor_ioctrl_end:\r
-    return ret;\r
-}\r
-\r
-static int rk29_sensor_powerdown(struct device *dev, int on)\r
-{\r
-       return rk29_sensor_ioctrl(dev,Cam_PowerDown,on);\r
-}\r
-static int rk29_sensor_power(struct device *dev, int on)\r
-{\r
-    if (!on)                        /* ddl@rock-chips.com : Ensure sensor enter standby or power off */\r
-        rk29_sensor_powerdown(dev,1);\r
-       rk29_sensor_ioctrl(dev,Cam_Power,on);    \r
-    return 0;\r
-}\r
-static int rk29_sensor_reset(struct device *dev)\r
-{\r
-       rk29_sensor_ioctrl(dev,Cam_Reset,1);\r
-       msleep(2);\r
-       rk29_sensor_ioctrl(dev,Cam_Reset,0);\r
-       return 0;\r
-}\r
+#include "../../../arch/arm/plat-rk/rk_camera.c"\r
 \r
 #if (CONFIG_SENSOR_IIC_ADDR_0 != 0x00)\r
 static struct i2c_board_info rk29_i2c_cam_info_0[] = {\r
@@ -1876,11 +985,11 @@ static struct i2c_board_info rk29_i2c_cam_info_0[] = {
 \r
 static struct soc_camera_link rk29_iclink_0 = {\r
        .bus_id         = RK29_CAM_PLATFORM_DEV_ID,\r
-       .power          = rk29_sensor_power,\r
+       .power          = rk_sensor_power,\r
 #if (CONFIG_SENSOR_RESET_PIN_0 != INVALID_GPIO)\r
-    .reset      = rk29_sensor_reset,\r
+    .reset      = rk_sensor_reset,\r
 #endif    \r
-       .powerdown  = rk29_sensor_powerdown,\r
+       .powerdown  = rk_sensor_powerdown,\r
        .board_info     = &rk29_i2c_cam_info_0[0],\r
        .i2c_adapter_id = CONFIG_SENSOR_IIC_ADAPTER_ID_0,\r
        .module_name    = SENSOR_NAME_0,\r
@@ -1905,11 +1014,11 @@ static struct i2c_board_info rk29_i2c_cam_info_1[] = {
 \r
 static struct soc_camera_link rk29_iclink_1 = {\r
        .bus_id         = RK29_CAM_PLATFORM_DEV_ID,\r
-       .power          = rk29_sensor_power,\r
+       .power          = rk_sensor_power,\r
 #if (CONFIG_SENSOR_RESET_PIN_1 != INVALID_GPIO)\r
-    .reset      = rk29_sensor_reset,\r
+    .reset      = rk_sensor_reset,\r
 #endif         \r
-       .powerdown  = rk29_sensor_powerdown,\r
+       .powerdown  = rk_sensor_powerdown,\r
        .board_info     = &rk29_i2c_cam_info_1[0],\r
        .i2c_adapter_id = CONFIG_SENSOR_IIC_ADAPTER_ID_1,\r
        .module_name    = SENSOR_NAME_1,\r
@@ -1925,130 +1034,6 @@ static struct platform_device rk29_soc_camera_pdrv_1 = {
        },\r
 };\r
 #endif\r
-#ifdef CONFIG_SENSOR_01\r
-#if (CONFIG_SENSOR_IIC_ADDR_01 != 0x00)\r
-static struct i2c_board_info rk29_i2c_cam_info_01[] = {\r
-       {\r
-               I2C_BOARD_INFO(SENSOR_NAME_01, CONFIG_SENSOR_IIC_ADDR_01>>1)\r
-       },\r
-};\r
-\r
-static struct soc_camera_link rk29_iclink_01 = {\r
-       .bus_id         = RK29_CAM_PLATFORM_DEV_ID,\r
-       .power          = rk29_sensor_power,\r
-#if (CONFIG_SENSOR_RESET_PIN_01 != INVALID_GPIO)\r
-    .reset      = rk29_sensor_reset,\r
-#endif    \r
-       .powerdown  = rk29_sensor_powerdown,\r
-       .board_info     = &rk29_i2c_cam_info_01[0],\r
-       .i2c_adapter_id = CONFIG_SENSOR_IIC_ADAPTER_ID_01,\r
-       .module_name    = SENSOR_NAME_01,\r
-};\r
-\r
-/*platform_device : soc-camera need  */\r
-static struct platform_device rk29_soc_camera_pdrv_01 = {\r
-       .name   = "soc-camera-pdrv",\r
-       .id     = 8,\r
-       .dev    = {\r
-               .init_name = SENSOR_DEVICE_NAME_01,\r
-               .platform_data = &rk29_iclink_01,\r
-       },\r
-};\r
-#endif\r
-#endif\r
-#ifdef CONFIG_SENSOR_02\r
-#if (CONFIG_SENSOR_IIC_ADDR_02 != 0x00)\r
-static struct i2c_board_info rk29_i2c_cam_info_02[] = {\r
-       {\r
-               I2C_BOARD_INFO(SENSOR_NAME_02, CONFIG_SENSOR_IIC_ADDR_02>>1)\r
-       },\r
-};\r
-\r
-static struct soc_camera_link rk29_iclink_02 = {\r
-       .bus_id         = RK29_CAM_PLATFORM_DEV_ID,\r
-       .power          = rk29_sensor_power,\r
-#if (CONFIG_SENSOR_RESET_PIN_02 != INVALID_GPIO)\r
-    .reset      = rk29_sensor_reset,\r
-#endif    \r
-       .powerdown  = rk29_sensor_powerdown,\r
-       .board_info     = &rk29_i2c_cam_info_02[0],\r
-       .i2c_adapter_id = CONFIG_SENSOR_IIC_ADAPTER_ID_02,\r
-       .module_name    = SENSOR_NAME_02,\r
-};\r
-\r
-/*platform_device : soc-camera need  */\r
-static struct platform_device rk29_soc_camera_pdrv_02 = {\r
-       .name   = "soc-camera-pdrv",\r
-       .id     = 3,\r
-       .dev    = {\r
-               .init_name = SENSOR_DEVICE_NAME_02,\r
-               .platform_data = &rk29_iclink_02,\r
-       },\r
-};\r
-#endif\r
-#endif\r
-#ifdef CONFIG_SENSOR_11\r
-#if (CONFIG_SENSOR_IIC_ADDR_11 != 0x00)\r
-static struct i2c_board_info rk29_i2c_cam_info_11[] = {\r
-       {\r
-               I2C_BOARD_INFO(SENSOR_NAME_11, CONFIG_SENSOR_IIC_ADDR_11>>1)\r
-       },\r
-};\r
-\r
-static struct soc_camera_link rk29_iclink_11 = {\r
-       .bus_id         = RK29_CAM_PLATFORM_DEV_ID,\r
-       .power          = rk29_sensor_power,\r
-#if (CONFIG_SENSOR_RESET_PIN_11 != INVALID_GPIO)\r
-    .reset      = rk29_sensor_reset,\r
-#endif         \r
-       .powerdown  = rk29_sensor_powerdown,\r
-       .board_info     = &rk29_i2c_cam_info_11[0],\r
-       .i2c_adapter_id = CONFIG_SENSOR_IIC_ADAPTER_ID_11,\r
-       .module_name    = SENSOR_NAME_11,\r
-};\r
-\r
-/*platform_device : soc-camera need  */\r
-static struct platform_device rk29_soc_camera_pdrv_11 = {\r
-       .name   = "soc-camera-pdrv",\r
-       .id     = 4,\r
-       .dev    = {\r
-               .init_name = SENSOR_DEVICE_NAME_11,\r
-               .platform_data = &rk29_iclink_11,\r
-       },\r
-};\r
-#endif\r
-#endif\r
-#ifdef CONFIG_SENSOR_12\r
-#if (CONFIG_SENSOR_IIC_ADDR_12 != 0x00)\r
-static struct i2c_board_info rk29_i2c_cam_info_12[] = {\r
-       {\r
-               I2C_BOARD_INFO(SENSOR_NAME_12, CONFIG_SENSOR_IIC_ADDR_12>>1)\r
-       },\r
-};\r
-\r
-static struct soc_camera_link rk29_iclink_12 = {\r
-       .bus_id         = RK29_CAM_PLATFORM_DEV_ID,\r
-       .power          = rk29_sensor_power,\r
-#if (CONFIG_SENSOR_RESET_PIN_12 != INVALID_GPIO)\r
-    .reset      = rk29_sensor_reset,\r
-#endif         \r
-       .powerdown  = rk29_sensor_powerdown,\r
-       .board_info     = &rk29_i2c_cam_info_12[0],\r
-       .i2c_adapter_id = CONFIG_SENSOR_IIC_ADAPTER_ID_12,\r
-       .module_name    = SENSOR_NAME_12,\r
-};\r
-\r
-/*platform_device : soc-camera need  */\r
-static struct platform_device rk29_soc_camera_pdrv_12 = {\r
-       .name   = "soc-camera-pdrv",\r
-       .id     = 5,\r
-       .dev    = {\r
-               .init_name = SENSOR_DEVICE_NAME_12,\r
-               .platform_data = &rk29_iclink_12,\r
-       },\r
-};\r
-#endif\r
-#endif\r
 \r
 static u64 rockchip_device_camera_dmamask = 0xffffffffUL;\r
 static struct resource rk29_camera_resource[] = {\r
@@ -2073,58 +1058,44 @@ static struct platform_device rk29_device_camera = {
        .dev            = {\r
                .dma_mask = &rockchip_device_camera_dmamask,\r
                .coherent_dma_mask = 0xffffffffUL,\r
-               .platform_data  = &rk29_camera_platform_data,\r
+               .platform_data  = &rk_camera_platform_data,\r
        }\r
 };\r
-#if (PMEM_CAM_SIZE > 0)\r
-static struct android_pmem_platform_data android_pmem_cam_pdata = {\r
-       .name           = "pmem_cam",\r
-       .start          = PMEM_CAM_BASE,\r
-       .size           = PMEM_CAM_SIZE,\r
-       .no_allocator   = 1,\r
-       .cached         = 1,\r
-};\r
 \r
-static struct platform_device android_pmem_cam_device = {\r
-       .name           = "android_pmem",\r
-       .id             = 1,\r
-       .dev            = {\r
-               .platform_data = &android_pmem_cam_pdata,\r
-       },\r
-};\r
-#endif\r
+static void rk_init_camera_plateform_data(void)\r
+{\r
+    int i,dev_idx;\r
+    \r
+    dev_idx = 0;\r
+    for (i=0; i<RK_CAM_NUM; i++) {\r
+        if (rk_camera_platform_data.register_dev[i].device_info.name) {            \r
+            rk_camera_platform_data.register_dev[i].link_info.board_info = \r
+                &rk_camera_platform_data.register_dev[i].i2c_cam_info;\r
+            rk_camera_platform_data.register_dev[i].device_info.id = dev_idx;\r
+            rk_camera_platform_data.register_dev[i].device_info.dev.platform_data = \r
+                &rk_camera_platform_data.register_dev[i].link_info;\r
+            dev_idx++;\r
+        }\r
+    }\r
+}\r
 \r
 static int rk_register_camera_devices(void)\r
 {   \r
-#ifdef CONFIG_SENSOR_IIC_ADDR_01\r
-#if CONFIG_SENSOR_IIC_ADDR_01\r
-    platform_device_register(&rk29_soc_camera_pdrv_01);\r
-#endif\r
-#endif\r
-\r
-#ifdef CONFIG_SENSOR_IIC_ADDR_02\r
-#if CONFIG_SENSOR_IIC_ADDR_02\r
-    platform_device_register(&rk29_soc_camera_pdrv_02);\r
-#endif\r
-#endif\r
-\r
-#ifdef CONFIG_SENSOR_IIC_ADDR_11\r
-#if CONFIG_SENSOR_IIC_ADDR_11\r
-    platform_device_register(&rk29_soc_camera_pdrv_11);\r
-#endif\r
-#endif\r
-\r
-#ifdef CONFIG_SENSOR_IIC_ADDR_12\r
-#if CONFIG_SENSOR_IIC_ADDR_12\r
-    platform_device_register(&rk29_soc_camera_pdrv_12);\r
-#endif\r
-#endif\r
+    int i;\r
+    \r
+       rk_init_camera_plateform_data();\r
+    for (i=0; i<RK_CAM_NUM; i++) {\r
+        if (rk_camera_platform_data.register_dev[i].device_info.name\r
+            && !strcmp(rk_camera_platform_data.register_dev[i].device_info.dev.init_name,SENSOR_DEVICE_NAME_0)\r
+            && !strcmp(rk_camera_platform_data.register_dev[i].device_info.dev.init_name,SENSOR_DEVICE_NAME_1)) {\r
+            platform_device_register(&rk_camera_platform_data.register_dev[i].device_info);\r
+        }\r
+    }\r
        return 0;\r
 }\r
 \r
 module_init(rk_register_camera_devices);\r
 \r
-\r
 #endif\r
 \r
 #endif //#ifdef CONFIG_VIDEO_RK29\r
index dd7cd4534bd8020313c77e7a53be232714c750e0..a78947106bbb173f9aeac1094ccaa836a23becb2 100755 (executable)
@@ -9,7 +9,7 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  */
-
+#ifdef CONFIG_ARCH_RK29
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/io.h>
@@ -151,8 +151,9 @@ module_param(debug, int, S_IRUGO|S_IWUSR|S_IWGRP);
 *v0.x.7 : this driver product resolution by IPP crop and scale, which user request but sensor can't support;
 *         note: this version is only provide yifang client, which is not official version;
 *v0.x.8 : this driver and rk29_camera.c support upto 3 back-sensors and upto 3 front-sensors;
+*v0.x.9 : camera io code is compatible for rk29xx and rk30xx
 */
-#define RK29_CAM_VERSION_CODE KERNEL_VERSION(0, 1, 8)
+#define RK29_CAM_VERSION_CODE KERNEL_VERSION(0, 1, 9)
 
 /* limit to rk29 hardware capabilities */
 #define RK29_CAM_BUS_PARAM   (SOCAM_MASTER |\
@@ -2280,3 +2281,4 @@ module_exit(rk29_camera_exit);
 MODULE_DESCRIPTION("RK29 Soc Camera Host driver");
 MODULE_AUTHOR("ddl <ddl@rock-chips>");
 MODULE_LICENSE("GPL");
+#endif
index f9cb9ba5869c462293be65f77656b56b77c5f068..1ef40b89ef50bf70553f04eef0c12f859408b781 100755 (executable)
-#include <plat/rk_camera.h> \r
+\r
 #include <mach/iomux.h>\r
 #include <media/soc_camera.h>\r
 #include <linux/android_pmem.h>\r
-#ifndef PMEM_CAM_SIZE\r
-#ifdef CONFIG_VIDEO_RK29 \r
-/*---------------- Camera Sensor Fixed Macro Begin  ------------------------*/\r
-// Below Macro is fixed, programer don't change it!!!!!!\r
-#define _CONS(a,b) a##b\r
-#define CONS(a,b) _CONS(a,b)\r
 \r
-#define __STR(x) #x\r
-#define _STR(x) __STR(x)\r
-#define STR(x) _STR(x)\r
-\r
-#if (CONFIG_SENSOR_IIC_ADDR_0 != 0x00)\r
-#define PMEM_SENSOR_FULL_RESOLUTION_0  CONS(CONFIG_SENSOR_0,_FULL_RESOLUTION)\r
-#define SENSOR_CIF_BUSID_0                             CONS(RK_CAM_PLATFORM_DEV_ID_,CONFIG_SENSOR_CIF_INDEX_0)\r
-#if !(PMEM_SENSOR_FULL_RESOLUTION_0)\r
-#undef PMEM_SENSOR_FULL_RESOLUTION_0\r
-#define PMEM_SENSOR_FULL_RESOLUTION_0  0x500000\r
-#endif\r
-#if(SENSOR_CIF_BUSID_0 == RK_CAM_PLATFORM_DEV_ID_0)\r
-#define PMEM_SENSOR_FULL_RESOLUTION_CIF_0 PMEM_SENSOR_FULL_RESOLUTION_0\r
-#define PMEM_SENSOR_FULL_RESOLUTION_CIF_1 0\r
-#else\r
-#define PMEM_SENSOR_FULL_RESOLUTION_CIF_1 PMEM_SENSOR_FULL_RESOLUTION_0\r
-#define PMEM_SENSOR_FULL_RESOLUTION_CIF_0 0\r
-#endif\r
-#else\r
-#define PMEM_SENSOR_FULL_RESOLUTION_CIF_0 0x00\r
-#define PMEM_SENSOR_FULL_RESOLUTION_CIF_1 0x00\r
-#endif\r
\r
-#if (CONFIG_SENSOR_IIC_ADDR_1 != 0x00)\r
-#define PMEM_SENSOR_FULL_RESOLUTION_1  CONS(CONFIG_SENSOR_1,_FULL_RESOLUTION)\r
-#define SENSOR_CIF_BUSID_1                             CONS(RK_CAM_PLATFORM_DEV_ID_,CONFIG_SENSOR_CIF_INDEX_1)\r
-#if !(PMEM_SENSOR_FULL_RESOLUTION_1)\r
-#undef PMEM_SENSOR_FULL_RESOLUTION_1\r
-#define PMEM_SENSOR_FULL_RESOLUTION_1  0x500000\r
-#endif\r
-#if (SENSOR_CIF_BUSID_1 == RK_CAM_PLATFORM_DEV_ID_0)\r
-          #if (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 < PMEM_SENSOR_FULL_RESOLUTION_1)\r
-          #undef PMEM_SENSOR_FULL_RESOLUTION_CIF_0\r
-          #define PMEM_SENSOR_FULL_RESOLUTION_CIF_0 PMEM_SENSOR_FULL_RESOLUTION_1\r
-          #endif\r
-#else\r
-          #if (PMEM_SENSOR_FULL_RESOLUTION_CIF_1 < PMEM_SENSOR_FULL_RESOLUTION_1)\r
-          #undef PMEM_SENSOR_FULL_RESOLUTION_CIF_1\r
-          #define PMEM_SENSOR_FULL_RESOLUTION_CIF_1 PMEM_SENSOR_FULL_RESOLUTION_1\r
-          #endif\r
-#endif\r
-#endif\r
-\r
-//CIF 0\r
-#if (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 == 0x500000)\r
-#define PMEM_CAM_NECESSARY   0x1400000       /* 1280*720*1.5*4(preview) + 7.5M(capture raw) + 4M(jpeg encode output) */\r
-#define PMEM_CAMIPP_NECESSARY_CIF0    0x800000\r
-#elif (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 == 0x300000)\r
-#define PMEM_CAM_NECESSARY   0xe00000        /* 1280*720*1.5*4(preview) + 4.5M(capture raw) + 3M(jpeg encode output) */\r
-#define PMEM_CAMIPP_NECESSARY_CIF_0    0x500000\r
-#elif (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 == 0x200000) /* 1280*720*1.5*4(preview) + 3M(capture raw) + 3M(jpeg encode output) */\r
-#define PMEM_CAM_NECESSARY   0xc00000\r
-#define PMEM_CAMIPP_NECESSARY_CIF_0    0x400000\r
-#elif ((PMEM_SENSOR_FULL_RESOLUTION_CIF_0 == 0x100000) || (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 == 0x130000))\r
-#define PMEM_CAM_NECESSARY   0x800000        /* 800*600*1.5*4(preview) + 2M(capture raw) + 2M(jpeg encode output) */\r
-#define PMEM_CAMIPP_NECESSARY_CIF_0    0x400000\r
-#elif (PMEM_SENSOR_FULL_RESOLUTION_CIF_0 == 0x30000)\r
-#define PMEM_CAM_NECESSARY   0x400000        /* 640*480*1.5*4(preview) + 1M(capture raw) + 1M(jpeg encode output) */\r
-#define PMEM_CAMIPP_NECESSARY_CIF_0    0x400000\r
-#else\r
-#define PMEM_CAM_NECESSARY   0x1200000\r
-#define PMEM_CAMIPP_NECESSARY_CIF_0    0x800000\r
-#endif\r
-\r
-//CIF 1\r
-#if (PMEM_SENSOR_FULL_RESOLUTION_CIF_1 == 0x500000)\r
-#define PMEM_CAM_NECESSARY      0x1400000               /* 1280*720*1.5*4(preview) + 7.5M(capture raw) + 4M(jpeg encode output) */\r
-#define PMEM_CAMIPP_NECESSARY_CIF_1      0x800000\r
-#elif (PMEM_SENSOR_FULL_RESOLUTION_CIF_1 == 0x300000)\r
-#define PMEM_CAM_NECESSARY      0xe00000                /* 1280*720*1.5*4(preview) + 4.5M(capture raw) + 3M(jpeg encode output) */\r
-#define PMEM_CAMIPP_NECESSARY_CIF_1    0x500000\r
-#elif (PMEM_SENSOR_FULL_RESOLUTION_CIF_1== 0x200000) /* 1280*720*1.5*4(preview) + 3M(capture raw) + 3M(jpeg encode output) */\r
-#define PMEM_CAM_NECESSARY      0xc00000\r
-#define PMEM_CAMIPP_NECESSARY_CIF_1    0x400000\r
-#elif ((PMEM_SENSOR_FULL_RESOLUTION_CIF_1 == 0x100000) || (PMEM_SENSOR_FULL_RESOLUTION_CIF_1 == 0x130000))\r
-#define PMEM_CAM_NECESSARY      0x800000                /* 800*600*1.5*4(preview) + 2M(capture raw) + 2M(jpeg encode output) */\r
-#define PMEM_CAMIPP_NECESSARY_CIF_1    0x400000\r
-#elif (PMEM_SENSOR_FULL_RESOLUTION_CIF_1 == 0x30000)\r
-#define PMEM_CAM_NECESSARY      0x400000                /* 640*480*1.5*4(preview) + 1M(capture raw) + 1M(jpeg encode output) */\r
-#define PMEM_CAMIPP_NECESSARY_CIF_1    0x400000\r
+#ifndef PMEM_CAM_SIZE\r
+#include "../../../arch/arm/plat-rk/rk_camera.c"\r
 #else\r
-#define PMEM_CAM_NECESSARY      0x1200000\r
-#define PMEM_CAMIPP_NECESSARY_CIF_1    0x800000\r
-#endif\r
-/*---------------- Camera Sensor Fixed Macro End  ------------------------*/\r
-#else  //#ifdef CONFIG_VIDEO_RK \r
-#define PMEM_CAM_NECESSARY      0x00000000\r
-#endif\r
-#else   // #ifdef PMEM_CAM_SIZE\r
-\r
 /*****************************************************************************************\r
  * camera  devices\r
  * author: ddl@rock-chips.com\r
  *****************************************************************************************/\r
 #ifdef CONFIG_VIDEO_RK29 \r
-static int camera_debug;\r
-module_param(camera_debug, int, S_IRUGO|S_IWUSR);\r
-\r
-#define ddprintk(level, fmt, arg...) do {                      \\r
-       if (camera_debug >= level)                                      \\r
-           printk(KERN_WARNING"rk_cam_io: " fmt , ## arg); } while (0)\r
-\r
-#define dprintk(format, ...) ddprintk(1, format, ## __VA_ARGS__)    \r
-\r
-#define SENSOR_NAME_0 STR(CONFIG_SENSOR_0)                     /* back camera sensor */\r
-#define SENSOR_NAME_1 STR(CONFIG_SENSOR_1)                     /* front camera sensor */\r
-#define SENSOR_DEVICE_NAME_0  STR(CONS(CONFIG_SENSOR_0, _back))\r
-#define SENSOR_DEVICE_NAME_1  STR(CONS(CONFIG_SENSOR_1, _front))\r
-\r
-static int rk_sensor_io_init(void);\r
-static int rk_sensor_io_deinit(int sensor);\r
-static int rk_sensor_ioctrl(struct device *dev,enum rk29camera_ioctrl_cmd cmd, int on);\r
-static int rk_sensor_power(struct device *dev, int on);\r
-static int rk_sensor_reset(struct device *dev);\r
-static int rk_sensor_powerdown(struct device *dev, int on);\r
-static struct rk29camera_platform_data rk_camera_platform_data = {\r
-    .io_init = rk_sensor_io_init,\r
-    .io_deinit = rk_sensor_io_deinit,\r
-    .sensor_ioctrl = rk_sensor_ioctrl,\r
-    \r
-    .gpio_res[0] = {\r
-               .gpio_reset = INVALID_GPIO,\r
-               .gpio_power = INVALID_GPIO,\r
-               .gpio_powerdown = INVALID_GPIO,\r
-               .gpio_flash = INVALID_GPIO,\r
-               .gpio_flag = 0,\r
-               .gpio_init = 0,                    \r
-               .dev_name = NULL,\r
-    },\r
-       .gpio_res[1] = {\r
-               .gpio_reset = INVALID_GPIO,\r
-               .gpio_power = INVALID_GPIO,\r
-               .gpio_powerdown = INVALID_GPIO,\r
-               .gpio_flash = INVALID_GPIO,\r
-               .gpio_flag = 0,\r
-               .gpio_init = 0,                    \r
-               .dev_name = NULL,\r
-       },\r
-    .info[0] = {\r
-            .dev_name = NULL,\r
-            .orientation = 0, \r
-       },\r
-    .info[1] = {\r
-               .dev_name = NULL,\r
-               .orientation = 0, \r
-       },\r
-    .sensor_init_data[0] = NULL,\r
-    .sensor_init_data[1] = NULL,\r
-};\r
-\r
-#if (CONFIG_SENSOR_IIC_ADDR_0 != 0x00)\r
-static struct i2c_board_info rk_i2c_cam_info_0[] = {\r
-       {\r
-               I2C_BOARD_INFO(SENSOR_NAME_0, CONFIG_SENSOR_IIC_ADDR_0>>1)\r
-       },\r
-};\r
-\r
-static struct soc_camera_link rk_iclink_0 = {\r
-       .bus_id= SENSOR_CIF_BUSID_0,\r
-       .power          = rk_sensor_power,\r
-#if (CONFIG_SENSOR_RESET_PIN_0 != INVALID_GPIO)\r
-       .reset          = rk_sensor_reset,\r
-#endif   \r
-       .powerdown      = rk_sensor_powerdown,\r
-       .board_info = &rk_i2c_cam_info_0[0],\r
-       \r
-       .i2c_adapter_id = CONFIG_SENSOR_IIC_ADAPTER_ID_0,\r
-       .module_name    = SENSOR_NAME_0,\r
-};\r
-\r
-/*platform_device: soc-camera need  */\r
- struct platform_device rk_soc_camera_pdrv_0 = {\r
-       .name   = "soc-camera-pdrv",\r
-       .id = 0,\r
-       .dev    = {\r
-               .init_name = SENSOR_DEVICE_NAME_0,\r
-               .platform_data = &rk_iclink_0,\r
-       },\r
-};\r
-#else\r
- struct platform_device rk_soc_camera_pdrv_0 = {\r
-       .name   = NULL,\r
-};\r
-#endif\r
-#if (CONFIG_SENSOR_IIC_ADDR_1 != 0x00)\r
-static struct i2c_board_info rk_i2c_cam_info_1[] = {\r
-       {\r
-               I2C_BOARD_INFO(SENSOR_NAME_1, CONFIG_SENSOR_IIC_ADDR_1>>1)\r
-       },\r
-};\r
-\r
-static struct soc_camera_link rk_iclink_1 = {\r
-       .bus_id         = SENSOR_CIF_BUSID_1,\r
-       .power          = rk_sensor_power,\r
-#if (CONFIG_SENSOR_RESET_PIN_1 != INVALID_GPIO)\r
-       .reset          = rk_sensor_reset,\r
-#endif         \r
-       .powerdown      = rk_sensor_powerdown,\r
-       .board_info = &rk_i2c_cam_info_1[0],\r
-       .i2c_adapter_id = CONFIG_SENSOR_IIC_ADAPTER_ID_1,\r
-       .module_name    = SENSOR_NAME_1,\r
-};\r
-\r
-/*platform_device : soc-camera need  */\r
- struct platform_device rk_soc_camera_pdrv_1 = {\r
-       .name   = "soc-camera-pdrv",\r
-       .id = 1,\r
-       .dev    = {\r
-               .init_name = SENSOR_DEVICE_NAME_1,\r
-               .platform_data = &rk_iclink_1,\r
-       },\r
-};\r
-#else\r
- struct platform_device rk_soc_camera_pdrv_1 = {\r
-       .name   = NULL,\r
-};\r
-#endif\r
-\r
-static u64 rockchip_device_camera_dmamask = 0xffffffffUL;\r
-static struct resource rk_camera_resource_host_0[] = {\r
-       [0] = {\r
-               .start = RK30_CIF0_PHYS,\r
-               .end   = RK30_CIF0_PHYS + RK30_CIF0_SIZE - 1,\r
-               .flags = IORESOURCE_MEM,\r
-       },\r
-       [1] = {\r
-               .start = IRQ_CIF0,\r
-               .end   = IRQ_CIF0,\r
-               .flags = IORESOURCE_IRQ,\r
-       }\r
-};\r
-static struct resource rk_camera_resource_host_1[] = {\r
-       [0] = {\r
-               .start = RK30_CIF1_PHYS,\r
-               .end   = RK30_CIF1_PHYS + RK30_CIF1_SIZE - 1,\r
-               .flags = IORESOURCE_MEM,\r
-       },\r
-       [1] = {\r
-               .start = IRQ_CIF1,\r
-               .end   = IRQ_CIF1,\r
-               .flags = IORESOURCE_IRQ,\r
-       }\r
-};\r
-/*platform_device : */\r
- struct platform_device rk_device_camera_host_0 = {\r
-       .name             = RK29_CAM_DRV_NAME,\r
-       .id       = RK_CAM_PLATFORM_DEV_ID_0,                           /* This is used to put cameras on this interface */\r
-       .num_resources    = ARRAY_SIZE(rk_camera_resource_host_0),\r
-       .resource         = rk_camera_resource_host_0,\r
-       .dev                    = {\r
-               .dma_mask = &rockchip_device_camera_dmamask,\r
-               .coherent_dma_mask = 0xffffffffUL,\r
-               .platform_data  = &rk_camera_platform_data,\r
-       }\r
-};\r
-/*platform_device : */\r
- struct platform_device rk_device_camera_host_1 = {\r
-       .name             = RK29_CAM_DRV_NAME,\r
-       .id       = RK_CAM_PLATFORM_DEV_ID_1,                           /* This is used to put cameras on this interface */\r
-       .num_resources    = ARRAY_SIZE(rk_camera_resource_host_1),\r
-       .resource         = rk_camera_resource_host_1,\r
-       .dev                    = {\r
-               .dma_mask = &rockchip_device_camera_dmamask,\r
-               .coherent_dma_mask = 0xffffffffUL,\r
-               .platform_data  = &rk_camera_platform_data,\r
-       }\r
-};\r
-\r
-static void rk_init_camera_plateform_data(void)\r
-{\r
-       struct rk29camera_platform_data* tmp_host_plateform_data = &rk_camera_platform_data;\r
-       int cam_index_in = 0; \r
-#if (CONFIG_SENSOR_IIC_ADDR_0 != 0x00)\r
-       if(cam_index_in < RK_CAM_NUM){\r
-               tmp_host_plateform_data->sensor_init_data[cam_index_in] = rk_init_data_sensor_0_p;\r
-               tmp_host_plateform_data->gpio_res[cam_index_in].gpio_reset= CONFIG_SENSOR_RESET_PIN_0;\r
-               tmp_host_plateform_data->gpio_res[cam_index_in].gpio_power= CONFIG_SENSOR_POWER_PIN_0;\r
-               tmp_host_plateform_data->gpio_res[cam_index_in].gpio_powerdown= CONFIG_SENSOR_POWERDN_PIN_0;\r
-               tmp_host_plateform_data->gpio_res[cam_index_in].gpio_flash= CONFIG_SENSOR_FALSH_PIN_0;\r
-               tmp_host_plateform_data->gpio_res[cam_index_in].dev_name= SENSOR_DEVICE_NAME_0;\r
-               tmp_host_plateform_data->gpio_res[cam_index_in].gpio_flag= (CONFIG_SENSOR_POWERACTIVE_LEVEL_0|CONFIG_SENSOR_RESETACTIVE_LEVEL_0|CONFIG_SENSOR_POWERDNACTIVE_LEVEL_0|CONFIG_SENSOR_FLASHACTIVE_LEVEL_0);\r
-               tmp_host_plateform_data->gpio_res[cam_index_in].dev_name= SENSOR_DEVICE_NAME_0;\r
-               tmp_host_plateform_data->info[cam_index_in].dev_name= SENSOR_DEVICE_NAME_0;\r
-               tmp_host_plateform_data->info[cam_index_in].orientation= CONFIG_SENSOR_ORIENTATION_0;\r
-       }\r
-       cam_index_in++;\r
-#endif\r
-#if (CONFIG_SENSOR_IIC_ADDR_1 != 0x00)\r
-       if(cam_index_in < RK_CAM_NUM){\r
-               tmp_host_plateform_data->sensor_init_data[cam_index_in] = rk_init_data_sensor_1_p;\r
-               tmp_host_plateform_data->gpio_res[cam_index_in].gpio_reset= CONFIG_SENSOR_RESET_PIN_1;\r
-               tmp_host_plateform_data->gpio_res[cam_index_in].gpio_power= CONFIG_SENSOR_POWER_PIN_1;\r
-               tmp_host_plateform_data->gpio_res[cam_index_in].gpio_powerdown= CONFIG_SENSOR_POWERDN_PIN_1;\r
-               tmp_host_plateform_data->gpio_res[cam_index_in].gpio_flash= CONFIG_SENSOR_FALSH_PIN_1;\r
-               tmp_host_plateform_data->gpio_res[cam_index_in].dev_name= SENSOR_DEVICE_NAME_1;\r
-               tmp_host_plateform_data->gpio_res[cam_index_in].gpio_flag= (CONFIG_SENSOR_POWERACTIVE_LEVEL_1|CONFIG_SENSOR_RESETACTIVE_LEVEL_1|CONFIG_SENSOR_POWERDNACTIVE_LEVEL_1|CONFIG_SENSOR_FLASHACTIVE_LEVEL_1);\r
-               tmp_host_plateform_data->gpio_res[cam_index_in].dev_name= SENSOR_DEVICE_NAME_1;\r
-               tmp_host_plateform_data->info[cam_index_in].dev_name= SENSOR_DEVICE_NAME_1;\r
-               tmp_host_plateform_data->info[cam_index_in].orientation= CONFIG_SENSOR_ORIENTATION_1;\r
-       }\r
-       cam_index_in++;\r
-#endif\r
-}\r
 \r
 static int rk_sensor_iomux(int pin)\r
 {    \r
@@ -1081,24 +780,24 @@ static int rk_sensor_iomux(int pin)
             break;     \r
         }\r
         case RK30_PIN4_PD0:\r
-       {\r
-                rk30_mux_api_set(GPIO4D0_SMCDATA8_TRACEDATA8_NAME,0);                     \r
-               break;  \r
-       }\r
+           {\r
+                    rk30_mux_api_set(GPIO4D0_SMCDATA8_TRACEDATA8_NAME,0);                         \r
+                    break;     \r
+           }\r
         case RK30_PIN4_PD1:\r
         {\r
              rk30_mux_api_set(GPIO4D1_SMCDATA9_TRACEDATA9_NAME,0);             \r
-            break;     \r
+             break;    \r
         }\r
         case RK30_PIN4_PD2:\r
-       {\r
-                rk30_mux_api_set(GPIO4D2_SMCDATA10_TRACEDATA10_NAME,0);                           \r
-               break;  \r
-       }\r
+           {\r
+                    rk30_mux_api_set(GPIO4D2_SMCDATA10_TRACEDATA10_NAME,0);                                \r
+                    break;     \r
+           }\r
         case RK30_PIN4_PD3:\r
         {\r
              rk30_mux_api_set(GPIO4D3_SMCDATA11_TRACEDATA11_NAME,0);           \r
-            break;     \r
+             break;    \r
         }\r
         case RK30_PIN4_PD4:\r
         {\r
@@ -1150,608 +849,128 @@ static int rk_sensor_iomux(int pin)
     return 0;\r
 }\r
 \r
-static int sensor_power_default_cb (struct rk29camera_gpio_res *res, int on)\r
-{\r
-    int camera_power = res->gpio_power;\r
-    int camera_ioflag = res->gpio_flag;\r
-    int camera_io_init = res->gpio_init;\r
-    int ret = 0;\r
-    \r
-    if (camera_power != INVALID_GPIO)  {\r
-                    if (camera_io_init & RK29_CAM_POWERACTIVE_MASK) {\r
-            if (on) {\r
-               gpio_set_value(camera_power, ((camera_ioflag&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
-                       dprintk("%s..%s..PowerPin=%d ..PinLevel = %x   \n",__FUNCTION__,res->dev_name, camera_power, ((camera_ioflag&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
-                       msleep(10);\r
-               } else {\r
-                       gpio_set_value(camera_power, (((~camera_ioflag)&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
-                       dprintk("%s..%s..PowerPin=%d ..PinLevel = %x   \n",__FUNCTION__,res->dev_name, camera_power, (((~camera_ioflag)&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
-               }\r
-               } else {\r
-                       ret = RK29_CAM_EIO_REQUESTFAIL;\r
-                       printk("%s..%s..PowerPin=%d request failed!\n",__FUNCTION__,res->dev_name,camera_power);\r
-           }        \r
-    } else {\r
-               ret = RK29_CAM_EIO_INVALID;\r
-    } \r
-\r
-    return ret;\r
-}\r
-\r
-static int sensor_reset_default_cb (struct rk29camera_gpio_res *res, int on)\r
-{\r
-    int camera_reset = res->gpio_reset;\r
-    int camera_ioflag = res->gpio_flag;\r
-    int camera_io_init = res->gpio_init;  \r
-    int ret = 0;\r
-    \r
-    if (camera_reset != INVALID_GPIO) {\r
-               if (camera_io_init & RK29_CAM_RESETACTIVE_MASK) {\r
-                       if (on) {\r
-                       gpio_set_value(camera_reset, ((camera_ioflag&RK29_CAM_RESETACTIVE_MASK)>>RK29_CAM_RESETACTIVE_BITPOS));\r
-                       dprintk("%s..%s..ResetPin=%d ..PinLevel = %x \n",__FUNCTION__,res->dev_name,camera_reset, ((camera_ioflag&RK29_CAM_RESETACTIVE_MASK)>>RK29_CAM_RESETACTIVE_BITPOS));\r
-                       } else {\r
-                               gpio_set_value(camera_reset,(((~camera_ioflag)&RK29_CAM_RESETACTIVE_MASK)>>RK29_CAM_RESETACTIVE_BITPOS));\r
-                       dprintk("%s..%s..ResetPin= %d..PinLevel = %x   \n",__FUNCTION__,res->dev_name, camera_reset, (((~camera_ioflag)&RK29_CAM_RESETACTIVE_MASK)>>RK29_CAM_RESETACTIVE_BITPOS));\r
-               }\r
-               } else {\r
-                       ret = RK29_CAM_EIO_REQUESTFAIL;\r
-                       printk("%s..%s..ResetPin=%d request failed!\n",__FUNCTION__,res->dev_name,camera_reset);\r
-               }\r
-    } else {\r
-               ret = RK29_CAM_EIO_INVALID;\r
-    }\r
-\r
-    return ret;\r
-}\r
-\r
-static int sensor_powerdown_default_cb (struct rk29camera_gpio_res *res, int on)\r
-{\r
-    int camera_powerdown = res->gpio_powerdown;\r
-    int camera_ioflag = res->gpio_flag;\r
-    int camera_io_init = res->gpio_init;  \r
-    int ret = 0;    \r
-\r
-    if (camera_powerdown != INVALID_GPIO) {\r
-               if (camera_io_init & RK29_CAM_POWERDNACTIVE_MASK) {\r
-                       if (on) {\r
-                       gpio_set_value(camera_powerdown, ((camera_ioflag&RK29_CAM_POWERDNACTIVE_MASK)>>RK29_CAM_POWERDNACTIVE_BITPOS));\r
-                       dprintk("%s..%s..PowerDownPin=%d ..PinLevel = %x \n",__FUNCTION__,res->dev_name,camera_powerdown, ((camera_ioflag&RK29_CAM_POWERDNACTIVE_MASK)>>RK29_CAM_POWERDNACTIVE_BITPOS));\r
-                       } else {\r
-                               gpio_set_value(camera_powerdown,(((~camera_ioflag)&RK29_CAM_POWERDNACTIVE_MASK)>>RK29_CAM_POWERDNACTIVE_BITPOS));\r
-                       dprintk("%s..%s..PowerDownPin= %d..PinLevel = %x   \n",__FUNCTION__,res->dev_name, camera_powerdown, (((~camera_ioflag)&RK29_CAM_POWERDNACTIVE_MASK)>>RK29_CAM_POWERDNACTIVE_BITPOS));\r
-               }\r
-               } else {\r
-                       ret = RK29_CAM_EIO_REQUESTFAIL;\r
-                       dprintk("%s..%s..PowerDownPin=%d request failed!\n",__FUNCTION__,res->dev_name,camera_powerdown);\r
-               }\r
-    } else {\r
-               ret = RK29_CAM_EIO_INVALID;\r
-    }\r
-    return ret;\r
-}\r
-\r
-\r
-static int sensor_flash_default_cb (struct rk29camera_gpio_res *res, int on)\r
-{\r
-    int camera_flash = res->gpio_flash;\r
-    int camera_ioflag = res->gpio_flag;\r
-    int camera_io_init = res->gpio_init;  \r
-    int ret = 0;    \r
-\r
-    if (camera_flash != INVALID_GPIO) {\r
-               if (camera_io_init & RK29_CAM_FLASHACTIVE_MASK) {\r
-            switch (on)\r
-            {\r
-                case Flash_Off:\r
-                {\r
-                    gpio_set_value(camera_flash,(((~camera_ioflag)&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));\r
-                           dprintk("\n%s..%s..FlashPin= %d..PinLevel = %x   \n",__FUNCTION__,res->dev_name, camera_flash, (((~camera_ioflag)&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS)); \r
-                           break;\r
-                }\r
-\r
-                case Flash_On:\r
-                {\r
-                    gpio_set_value(camera_flash, ((camera_ioflag&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));\r
-                           dprintk("%s..%s..FlashPin=%d ..PinLevel = %x \n",__FUNCTION__,res->dev_name,camera_flash, ((camera_ioflag&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));\r
-                           break;\r
-                }\r
-\r
-                case Flash_Torch:\r
-                {\r
-                    gpio_set_value(camera_flash, ((camera_ioflag&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));\r
-                           dprintk("%s..%s..FlashPin=%d ..PinLevel = %x \n",__FUNCTION__,res->dev_name,camera_flash, ((camera_ioflag&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));\r
-                           break;\r
-                }\r
-\r
-                default:\r
-                {\r
-                    printk("%s..%s..Flash command(%d) is invalidate \n",__FUNCTION__,res->dev_name,on);\r
-                    break;\r
-                }\r
-            }\r
-               } else {\r
-                       ret = RK29_CAM_EIO_REQUESTFAIL;\r
-                       printk("%s..%s..FlashPin=%d request failed!\n",__FUNCTION__,res->dev_name,camera_flash);\r
-               }\r
-    } else {\r
-               ret = RK29_CAM_EIO_INVALID;\r
-    }\r
-    return ret;\r
-}\r
-\r
-\r
-static int rk_sensor_io_init(void)\r
-{\r
-    int ret = 0, i,j;\r
-    unsigned int camera_reset = INVALID_GPIO, camera_power = INVALID_GPIO;\r
-       unsigned int camera_powerdown = INVALID_GPIO, camera_flash = INVALID_GPIO;\r
-       unsigned int camera_ioflag;\r
-       static bool is_init = false;\r
-       struct rk29camera_platform_data* plat_data = &rk_camera_platform_data;\r
-       if(is_init){\r
-               //printk("sensor io has been initialized \n");\r
-               return 0;\r
-               }\r
-       else\r
-               is_init = true;\r
-    if (sensor_ioctl_cb.sensor_power_cb == NULL)\r
-        sensor_ioctl_cb.sensor_power_cb = sensor_power_default_cb;\r
-    if (sensor_ioctl_cb.sensor_reset_cb == NULL)\r
-        sensor_ioctl_cb.sensor_reset_cb = sensor_reset_default_cb;\r
-    if (sensor_ioctl_cb.sensor_powerdown_cb == NULL)\r
-        sensor_ioctl_cb.sensor_powerdown_cb = sensor_powerdown_default_cb;\r
-    if (sensor_ioctl_cb.sensor_flash_cb == NULL)\r
-        sensor_ioctl_cb.sensor_flash_cb = sensor_flash_default_cb;\r
-       for(i = 0;i < RK_CAM_NUM; i++){\r
-               camera_reset = plat_data->gpio_res[i].gpio_reset;\r
-               camera_power = plat_data->gpio_res[i].gpio_power;\r
-               camera_powerdown = plat_data->gpio_res[i].gpio_powerdown;\r
-               camera_flash = plat_data->gpio_res[i].gpio_flash;\r
-               camera_ioflag = plat_data->gpio_res[i].gpio_flag;\r
-               plat_data->gpio_res[i].gpio_init = 0;\r
-\r
-        if (camera_power != INVALID_GPIO) {\r
-            ret = gpio_request(camera_power, "camera power");\r
-            if (ret) {\r
-                if (i == 0) {\r
-                    printk("%s..%s..power pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_power);\r
-                                   goto sensor_io_init_erro;\r
-                } else {\r
-                    if (camera_power != plat_data->gpio_res[i].gpio_power) {\r
-                        printk("%s..%s..power pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_power);\r
-                        goto sensor_io_init_erro;\r
-                    }\r
-                }\r
-            }\r
-\r
-            if (rk_sensor_iomux(camera_power) < 0) {\r
-                printk(KERN_ERR "%s..%s..power pin(%d) iomux init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_power);\r
-                goto sensor_io_init_erro;\r
-            }\r
-            \r
-                       plat_data->gpio_res[i].gpio_init |= RK29_CAM_POWERACTIVE_MASK;\r
-            gpio_set_value(camera_reset, (((~camera_ioflag)&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
-            gpio_direction_output(camera_power, (((~camera_ioflag)&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
-\r
-                       dprintk("%s....power pin(%d) init success(0x%x)  \n",__FUNCTION__,camera_power,(((~camera_ioflag)&RK29_CAM_POWERACTIVE_MASK)>>RK29_CAM_POWERACTIVE_BITPOS));\r
-\r
-        }\r
-\r
-        if (camera_reset != INVALID_GPIO) {\r
-            ret = gpio_request(camera_reset, "camera reset");\r
-            if (ret) {\r
-                printk("%s..%s..reset pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_reset);\r
-                goto sensor_io_init_erro;\r
-            }\r
-\r
-            if (rk_sensor_iomux(camera_reset) < 0) {\r
-                printk(KERN_ERR "%s..%s..reset pin(%d) iomux init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_reset);\r
-                goto sensor_io_init_erro;\r
-            }\r
-            \r
-                       plat_data->gpio_res[i].gpio_init |= RK29_CAM_RESETACTIVE_MASK;\r
-            gpio_set_value(camera_reset, ((camera_ioflag&RK29_CAM_RESETACTIVE_MASK)>>RK29_CAM_RESETACTIVE_BITPOS));\r
-            gpio_direction_output(camera_reset, ((camera_ioflag&RK29_CAM_RESETACTIVE_MASK)>>RK29_CAM_RESETACTIVE_BITPOS));\r
-\r
-                       dprintk("%s....reset pin(%d) init success(0x%x)\n",__FUNCTION__,camera_reset,((camera_ioflag&RK29_CAM_RESETACTIVE_MASK)>>RK29_CAM_RESETACTIVE_BITPOS));\r
-\r
-        }\r
-\r
-               if (camera_powerdown != INVALID_GPIO) {\r
-            ret = gpio_request(camera_powerdown, "camera powerdown");\r
-            if (ret) {\r
-                printk("%s..%s..powerdown pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_powerdown);\r
-                goto sensor_io_init_erro;\r
-            }\r
-\r
-            if (rk_sensor_iomux(camera_powerdown) < 0) {\r
-                printk(KERN_ERR "%s..%s..powerdown pin(%d) iomux init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_powerdown);\r
-                goto sensor_io_init_erro;\r
-            }\r
-            \r
-                       plat_data->gpio_res[i].gpio_init |= RK29_CAM_POWERDNACTIVE_MASK;\r
-            gpio_set_value(camera_powerdown, ((camera_ioflag&RK29_CAM_POWERDNACTIVE_MASK)>>RK29_CAM_POWERDNACTIVE_BITPOS));\r
-            gpio_direction_output(camera_powerdown, ((camera_ioflag&RK29_CAM_POWERDNACTIVE_MASK)>>RK29_CAM_POWERDNACTIVE_BITPOS));\r
-\r
-                       dprintk("%s....powerdown pin(%d) init success(0x%x) \n",__FUNCTION__,camera_powerdown,((camera_ioflag&RK29_CAM_POWERDNACTIVE_BITPOS)>>RK29_CAM_POWERDNACTIVE_BITPOS));\r
-\r
-        }\r
-\r
-               if (camera_flash != INVALID_GPIO) {\r
-            ret = gpio_request(camera_flash, "camera flash");\r
-            if (ret) {\r
-                printk("%s..%s..flash pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_flash);\r
-                               goto sensor_io_init_erro;\r
-            }\r
-\r
-            if (rk_sensor_iomux(camera_flash) < 0) {\r
-                printk(KERN_ERR "%s..%s..flash pin(%d) iomux init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_flash);                \r
-            }\r
-            \r
-                       plat_data->gpio_res[i].gpio_init |= RK29_CAM_FLASHACTIVE_MASK;\r
-            gpio_set_value(camera_flash, ((~camera_ioflag&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));    /* falsh off */\r
-            gpio_direction_output(camera_flash, ((~camera_ioflag&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));\r
-\r
-                       dprintk("%s....flash pin(%d) init success(0x%x) \n",__FUNCTION__,camera_flash,((camera_ioflag&RK29_CAM_FLASHACTIVE_MASK)>>RK29_CAM_FLASHACTIVE_BITPOS));\r
-\r
-        }  \r
-\r
-        \r
-        for (j=0; j<10; j++) {\r
-            memset(&plat_data->info[i].fival[j],0x00,sizeof(struct v4l2_frmivalenum));\r
-        }\r
-        j=0;\r
-        if (plat_data->info[i].dev_name && strstr(plat_data->info[i].dev_name,"_back")) {\r
-            \r
-            #if CONFIG_SENSOR_QCIF_FPS_FIXED_0\r
-            plat_data->info[i].fival[j].discrete.denominator = CONFIG_SENSOR_QCIF_FPS_FIXED_0;\r
-            plat_data->info[i].fival[j].discrete.numerator= 1;\r
-            plat_data->info[i].fival[j].index = 0;\r
-            plat_data->info[i].fival[j].pixel_format = V4L2_PIX_FMT_NV12;\r
-            plat_data->info[i].fival[j].width = 176;\r
-            plat_data->info[i].fival[j].height = 144;\r
-            plat_data->info[i].fival[j].type = V4L2_FRMIVAL_TYPE_DISCRETE;\r
-            j++;\r
-            #endif\r
-\r
-            #if CONFIG_SENSOR_QVGA_FPS_FIXED_0\r
-            plat_data->info[i].fival[j].discrete.denominator = CONFIG_SENSOR_QVGA_FPS_FIXED_0;\r
-            plat_data->info[i].fival[j].discrete.numerator= 1;\r
-            plat_data->info[i].fival[j].index = 0;\r
-            plat_data->info[i].fival[j].pixel_format = V4L2_PIX_FMT_NV12;\r
-            plat_data->info[i].fival[j].width = 320;\r
-            plat_data->info[i].fival[j].height = 240;\r
-            plat_data->info[i].fival[j].type = V4L2_FRMIVAL_TYPE_DISCRETE;\r
-            j++;\r
-            #endif\r
-\r
-            #if CONFIG_SENSOR_CIF_FPS_FIXED_0\r
-            plat_data->info[i].fival[j].discrete.denominator = CONFIG_SENSOR_CIF_FPS_FIXED_0;\r
-            plat_data->info[i].fival[j].discrete.numerator= 1;\r
-            plat_data->info[i].fival[j].index = 0;\r
-            plat_data->info[i].fival[j].pixel_format = V4L2_PIX_FMT_NV12;\r
-            plat_data->info[i].fival[j].width = 352;\r
-            plat_data->info[i].fival[j].height = 288;\r
-            plat_data->info[i].fival[j].type = V4L2_FRMIVAL_TYPE_DISCRETE;\r
-            j++;\r
-            #endif\r
-\r
-            #if CONFIG_SENSOR_VGA_FPS_FIXED_0\r
-            plat_data->info[i].fival[j].discrete.denominator = CONFIG_SENSOR_VGA_FPS_FIXED_0;\r
-            plat_data->info[i].fival[j].discrete.numerator= 1;\r
-            plat_data->info[i].fival[j].index = 0;\r
-            plat_data->info[i].fival[j].pixel_format = V4L2_PIX_FMT_NV12;\r
-            plat_data->info[i].fival[j].width = 640;\r
-            plat_data->info[i].fival[j].height = 480;\r
-            plat_data->info[i].fival[j].type = V4L2_FRMIVAL_TYPE_DISCRETE;\r
-            j++;\r
-            #endif\r
-\r
-            #if CONFIG_SENSOR_480P_FPS_FIXED_0\r
-            plat_data->info[i].fival[j].discrete.denominator = CONFIG_SENSOR_480P_FPS_FIXED_0;\r
-            plat_data->info[i].fival[j].discrete.numerator= 1;\r
-            plat_data->info[i].fival[j].index = 0;\r
-            plat_data->info[i].fival[j].pixel_format = V4L2_PIX_FMT_NV12;\r
-            plat_data->info[i].fival[j].width = 720;\r
-            plat_data->info[i].fival[j].height = 480;\r
-            plat_data->info[i].fival[j].type = V4L2_FRMIVAL_TYPE_DISCRETE;\r
-            j++;\r
-            #endif            \r
-\r
-            #if CONFIG_SENSOR_SVGA_FPS_FIXED_0\r
-            plat_data->info[i].fival[j].discrete.denominator = CONFIG_SENSOR_SVGA_FPS_FIXED_0;\r
-            plat_data->info[i].fival[j].discrete.numerator= 1;\r
-            plat_data->info[i].fival[j].index = 0;\r
-            plat_data->info[i].fival[j].pixel_format = V4L2_PIX_FMT_NV12;\r
-            plat_data->info[i].fival[j].width = 800;\r
-            plat_data->info[i].fival[j].height = 600;\r
-            plat_data->info[i].fival[j].type = V4L2_FRMIVAL_TYPE_DISCRETE;\r
-            j++;\r
-            #endif\r
-\r
-            #if CONFIG_SENSOR_720P_FPS_FIXED_0\r
-            plat_data->info[i].fival[j].discrete.denominator = CONFIG_SENSOR_720P_FPS_FIXED_0;\r
-            plat_data->info[i].fival[j].discrete.numerator= 1;\r
-            plat_data->info[i].fival[j].index = 0;\r
-            plat_data->info[i].fival[j].pixel_format = V4L2_PIX_FMT_NV12;\r
-            plat_data->info[i].fival[j].width = 1280;\r
-            plat_data->info[i].fival[j].height = 720;\r
-            plat_data->info[i].fival[j].type = V4L2_FRMIVAL_TYPE_DISCRETE;\r
-            j++;\r
-            #endif\r
-\r
-        } else {\r
-            #if CONFIG_SENSOR_QCIF_FPS_FIXED_1\r
-            plat_data->info[i].fival[j].discrete.denominator = CONFIG_SENSOR_QCIF_FPS_FIXED_1;\r
-            plat_data->info[i].fival[j].discrete.numerator= 1;\r
-            plat_data->info[i].fival[j].index = 0;\r
-            plat_data->info[i].fival[j].pixel_format = V4L2_PIX_FMT_NV12;\r
-            plat_data->info[i].fival[j].width = 176;\r
-            plat_data->info[i].fival[j].height = 144;\r
-            plat_data->info[i].fival[j].type = V4L2_FRMIVAL_TYPE_DISCRETE;\r
-            j++;\r
-            #endif\r
-\r
-            #if CONFIG_SENSOR_QVGA_FPS_FIXED_1\r
-            plat_data->info[i].fival[j].discrete.denominator = CONFIG_SENSOR_QVGA_FPS_FIXED_1;\r
-            plat_data->info[i].fival[j].discrete.numerator= 1;\r
-            plat_data->info[i].fival[j].index = 0;\r
-            plat_data->info[i].fival[j].pixel_format = V4L2_PIX_FMT_NV12;\r
-            plat_data->info[i].fival[j].width = 320;\r
-            plat_data->info[i].fival[j].height = 240;\r
-            plat_data->info[i].fival[j].type = V4L2_FRMIVAL_TYPE_DISCRETE;\r
-            j++;\r
-            #endif\r
-\r
-            #if CONFIG_SENSOR_CIF_FPS_FIXED_1\r
-            plat_data->info[i].fival[j].discrete.denominator = CONFIG_SENSOR_CIF_FPS_FIXED_1;\r
-            plat_data->info[i].fival[j].discrete.numerator= 1;\r
-            plat_data->info[i].fival[j].index = 0;\r
-            plat_data->info[i].fival[j].pixel_format = V4L2_PIX_FMT_NV12;\r
-            plat_data->info[i].fival[j].width = 352;\r
-            plat_data->info[i].fival[j].height = 288;\r
-            plat_data->info[i].fival[j].type = V4L2_FRMIVAL_TYPE_DISCRETE;\r
-            j++;\r
-            #endif\r
-\r
-            #if CONFIG_SENSOR_VGA_FPS_FIXED_1\r
-            plat_data->info[i].fival[j].discrete.denominator = CONFIG_SENSOR_VGA_FPS_FIXED_1;\r
-            plat_data->info[i].fival[j].discrete.numerator= 1;\r
-            plat_data->info[i].fival[j].index = 0;\r
-            plat_data->info[i].fival[j].pixel_format = V4L2_PIX_FMT_NV12;\r
-            plat_data->info[i].fival[j].width = 640;\r
-            plat_data->info[i].fival[j].height = 480;\r
-            plat_data->info[i].fival[j].type = V4L2_FRMIVAL_TYPE_DISCRETE;\r
-            j++;\r
-            #endif\r
+#include "../../../arch/arm/plat-rk/rk_camera.c"\r
 \r
-            #if CONFIG_SENSOR_480P_FPS_FIXED_1\r
-            plat_data->info[i].fival[j].discrete.denominator = CONFIG_SENSOR_480P_FPS_FIXED_1;\r
-            plat_data->info[i].fival[j].discrete.numerator= 1;\r
-            plat_data->info[i].fival[j].index = 0;\r
-            plat_data->info[i].fival[j].pixel_format = V4L2_PIX_FMT_NV12;\r
-            plat_data->info[i].fival[j].width = 720;\r
-            plat_data->info[i].fival[j].height = 480;\r
-            plat_data->info[i].fival[j].type = V4L2_FRMIVAL_TYPE_DISCRETE;\r
-            j++;\r
-            #endif \r
 \r
-            #if CONFIG_SENSOR_SVGA_FPS_FIXED_1\r
-            plat_data->info[i].fival[j].discrete.denominator = CONFIG_SENSOR_SVGA_FPS_FIXED_1;\r
-            plat_data->info[i].fival[j].discrete.numerator= 1;\r
-            plat_data->info[i].fival[j].index = 0;\r
-            plat_data->info[i].fival[j].pixel_format = V4L2_PIX_FMT_NV12;\r
-            plat_data->info[i].fival[j].width = 800;\r
-            plat_data->info[i].fival[j].height = 600;\r
-            plat_data->info[i].fival[j].type = V4L2_FRMIVAL_TYPE_DISCRETE;\r
-            j++;\r
-            #endif\r
 \r
-            #if CONFIG_SENSOR_720P_FPS_FIXED_1\r
-            plat_data->info[i].fival[j].discrete.denominator = CONFIG_SENSOR_720P_FPS_FIXED_1;\r
-            plat_data->info[i].fival[j].discrete.numerator= 1;\r
-            plat_data->info[i].fival[j].index = 0;\r
-            plat_data->info[i].fival[j].pixel_format = V4L2_PIX_FMT_NV12;\r
-            plat_data->info[i].fival[j].width = 1280;\r
-            plat_data->info[i].fival[j].height = 720;\r
-            plat_data->info[i].fival[j].type = V4L2_FRMIVAL_TYPE_DISCRETE;\r
-            j++;\r
-            #endif\r
-        }\r
-       continue;\r
-       sensor_io_init_erro:\r
-               rk_sensor_io_deinit(i);\r
-       }\r
-       return 0;\r
-}\r
-\r
-static int rk_sensor_io_deinit(int sensor)\r
-{\r
-    unsigned int camera_reset = INVALID_GPIO, camera_power = INVALID_GPIO;\r
-       unsigned int camera_powerdown = INVALID_GPIO, camera_flash = INVALID_GPIO;\r
-       struct rk29camera_platform_data* plat_data = &rk_camera_platform_data;\r
-    camera_reset = plat_data->gpio_res[sensor].gpio_reset;\r
-    camera_power = plat_data->gpio_res[sensor].gpio_power;\r
-       camera_powerdown = plat_data->gpio_res[sensor].gpio_powerdown;\r
-    camera_flash = plat_data->gpio_res[sensor].gpio_flash;\r
-\r
-    printk("%s..%s enter..\n",__FUNCTION__,plat_data->gpio_res[sensor].dev_name);\r
-\r
-       if (plat_data->gpio_res[sensor].gpio_init & RK29_CAM_POWERACTIVE_MASK) {\r
-           if (camera_power != INVALID_GPIO) {\r
-               gpio_direction_input(camera_power);\r
-               gpio_free(camera_power);\r
-           }\r
+static u64 rockchip_device_camera_dmamask = 0xffffffffUL;\r
+static struct resource rk_camera_resource_host_0[] = {\r
+       [0] = {\r
+               .start = RK30_CIF0_PHYS,\r
+               .end   = RK30_CIF0_PHYS + RK30_CIF0_SIZE - 1,\r
+               .flags = IORESOURCE_MEM,\r
+       },\r
+       [1] = {\r
+               .start = IRQ_CIF0,\r
+               .end   = IRQ_CIF0,\r
+               .flags = IORESOURCE_IRQ,\r
        }\r
-\r
-       if (plat_data->gpio_res[sensor].gpio_init & RK29_CAM_RESETACTIVE_MASK) {\r
-           if (camera_reset != INVALID_GPIO)  {\r
-               gpio_direction_input(camera_reset);\r
-               gpio_free(camera_reset);\r
-           }\r
+};\r
+static struct resource rk_camera_resource_host_1[] = {\r
+       [0] = {\r
+               .start = RK30_CIF1_PHYS,\r
+               .end   = RK30_CIF1_PHYS + RK30_CIF1_SIZE - 1,\r
+               .flags = IORESOURCE_MEM,\r
+       },\r
+       [1] = {\r
+               .start = IRQ_CIF1,\r
+               .end   = IRQ_CIF1,\r
+               .flags = IORESOURCE_IRQ,\r
        }\r
-\r
-       if (plat_data->gpio_res[sensor].gpio_init & RK29_CAM_POWERDNACTIVE_MASK) {\r
-           if (camera_powerdown != INVALID_GPIO)  {\r
-               gpio_direction_input(camera_powerdown);\r
-               gpio_free(camera_powerdown);\r
-           }\r
+};\r
+/*platform_device : */\r
+ struct platform_device rk_device_camera_host_0 = {\r
+       .name             = RK29_CAM_DRV_NAME,\r
+       .id       = RK_CAM_PLATFORM_DEV_ID_0,                           /* This is used to put cameras on this interface */\r
+       .num_resources    = ARRAY_SIZE(rk_camera_resource_host_0),\r
+       .resource         = rk_camera_resource_host_0,\r
+       .dev                    = {\r
+               .dma_mask = &rockchip_device_camera_dmamask,\r
+               .coherent_dma_mask = 0xffffffffUL,\r
+               .platform_data  = &rk_camera_platform_data,\r
        }\r
-\r
-       if (plat_data->gpio_res[sensor].gpio_init & RK29_CAM_FLASHACTIVE_MASK) {\r
-           if (camera_flash != INVALID_GPIO)  {\r
-               gpio_direction_input(camera_flash);\r
-               gpio_free(camera_flash);\r
-           }\r
+};\r
+/*platform_device : */\r
+ struct platform_device rk_device_camera_host_1 = {\r
+       .name             = RK29_CAM_DRV_NAME,\r
+       .id       = RK_CAM_PLATFORM_DEV_ID_1,                           /* This is used to put cameras on this interface */\r
+       .num_resources    = ARRAY_SIZE(rk_camera_resource_host_1),\r
+       .resource         = rk_camera_resource_host_1,\r
+       .dev                    = {\r
+               .dma_mask = &rockchip_device_camera_dmamask,\r
+               .coherent_dma_mask = 0xffffffffUL,\r
+               .platform_data  = &rk_camera_platform_data,\r
        }\r
-       plat_data->gpio_res[sensor].gpio_init = 0;\r
-       \r
-    return 0;\r
-}\r
-static int rk_sensor_ioctrl(struct device *dev,enum rk29camera_ioctrl_cmd cmd, int on)\r
-{\r
-    struct rk29camera_gpio_res *res = NULL;    \r
-       int ret = RK29_CAM_IO_SUCCESS,i = 0;\r
-\r
-       struct rk29camera_platform_data* plat_data = &rk_camera_platform_data;\r
-       //for test reg\r
-       for(i = 0;i < RK_CAM_NUM;i++){\r
-               if(plat_data->gpio_res[i].dev_name &&  (strcmp(plat_data->gpio_res[i].dev_name, dev_name(dev)) == 0)) {\r
-                               res = (struct rk29camera_gpio_res *)&plat_data->gpio_res[i];\r
-                               break;\r
-                   } \r
-               } \r
-     if(i == RK_CAM_NUM){\r
-               ret = RK29_CAM_EIO_INVALID;\r
-               goto rk_sensor_ioctrl_end;\r
-       }\r
-       \r
-       switch (cmd)\r
-       {\r
-               case Cam_Power:\r
-               {\r
-                       if (sensor_ioctl_cb.sensor_power_cb) {\r
-                ret = sensor_ioctl_cb.sensor_power_cb(res, on);\r
-                       } else {\r
-                printk(KERN_ERR "sensor_ioctl_cb.sensor_power_cb is NULL");\r
-                WARN_ON(1);\r
-                       }\r
-                       break;\r
-               }\r
-               case Cam_Reset:\r
-               {\r
-                       if (sensor_ioctl_cb.sensor_reset_cb) {\r
-                ret = sensor_ioctl_cb.sensor_reset_cb(res, on);\r
-                       } else {\r
-                printk(KERN_ERR "sensor_ioctl_cb.sensor_reset_cb is NULL");\r
-                WARN_ON(1);\r
-                       }\r
-                       break;\r
-               }\r
-\r
-               case Cam_PowerDown:\r
-               {\r
-                       if (sensor_ioctl_cb.sensor_powerdown_cb) {\r
-                ret = sensor_ioctl_cb.sensor_powerdown_cb(res, on);\r
-                       } else {\r
-                printk(KERN_ERR "sensor_ioctl_cb.sensor_powerdown_cb is NULL");\r
-                WARN_ON(1);\r
-                       }\r
-                       break;\r
-               }\r
+};\r
 \r
-               case Cam_Flash:\r
-               {\r
-                       if (sensor_ioctl_cb.sensor_flash_cb) {\r
-                ret = sensor_ioctl_cb.sensor_flash_cb(res, on);\r
-                       } else {\r
-                printk(KERN_ERR "sensor_ioctl_cb.sensor_flash_cb is NULL!");\r
-                WARN_ON(1);\r
-                       }\r
-                       break;\r
-               }\r
-               default:\r
-               {\r
-                       printk("%s cmd(0x%x) is unknown!\n",__FUNCTION__, cmd);\r
-                       break;\r
-               }\r
-       }\r
-rk_sensor_ioctrl_end:\r
-    return ret;\r
-}\r
-static int rk_sensor_power(struct device *dev, int on)\r
-{\r
-       rk_sensor_ioctrl(dev,Cam_Power,on);\r
-    return 0;\r
-}\r
-#if (CONFIG_SENSOR_RESET_PIN_0 != INVALID_GPIO) || (CONFIG_SENSOR_RESET_PIN_1 != INVALID_GPIO)\r
-static int rk_sensor_reset(struct device *dev)\r
-{\r
-       rk_sensor_ioctrl(dev,Cam_Reset,1);\r
-       msleep(2);\r
-       rk_sensor_ioctrl(dev,Cam_Reset,0);\r
-       return 0;\r
-}\r
-#endif\r
-static int rk_sensor_powerdown(struct device *dev, int on)\r
+static void rk_init_camera_plateform_data(void)\r
 {\r
-       return rk_sensor_ioctrl(dev,Cam_PowerDown,on);\r
+    int i,dev_idx;\r
+    \r
+    dev_idx = 0;\r
+    for (i=0; i<RK_CAM_NUM; i++) {\r
+        rk_camera_platform_data.sensor_init_data[i] = &rk_init_data_sensor[i];\r
+        if (rk_camera_platform_data.register_dev[i].device_info.name) {            \r
+            rk_camera_platform_data.register_dev[i].link_info.board_info = \r
+                &rk_camera_platform_data.register_dev[i].i2c_cam_info;\r
+            rk_camera_platform_data.register_dev[i].device_info.id = dev_idx;\r
+            rk_camera_platform_data.register_dev[i].device_info.dev.platform_data = \r
+                &rk_camera_platform_data.register_dev[i].link_info;\r
+            dev_idx++;\r
+        }\r
+    }\r
 }\r
 \r
-static struct android_pmem_platform_data android_pmem_cam_pdata = {\r
-       .name           = "pmem_cam",\r
-       //.start                = PMEM_CAM_BASE,\r
-       .size           = 0,\r
-       .no_allocator   = 1,\r
-       .cached         = 1,\r
-};\r
-\r
- struct platform_device android_pmem_cam_device = {\r
-       .name           = "android_pmem",\r
-       .id             = 1,\r
-       .dev            = {\r
-               .platform_data = &android_pmem_cam_pdata,\r
-       },\r
-};\r
- static void rk30_camera_request_reserve_mem(void)\r
+static void rk30_camera_request_reserve_mem(void)\r
 {\r
-#if (MEM_CAMIPP_SIZE_CIF_0 != 0)\r
-       #if CONFIG_USE_CIF_0\r
-                rk_camera_platform_data.meminfo.name = "camera_ipp_mem_0";\r
-                rk_camera_platform_data.meminfo.start = board_mem_reserve_add("camera_ipp_mem_0",MEM_CAMIPP_SIZE_CIF_0);\r
-                rk_camera_platform_data.meminfo.size= MEM_CAMIPP_SIZE_CIF_0;\r
-       #endif\r
-#endif\r
-\r
-#if (MEM_CAMIPP_SIZE_CIF_1 != 0)\r
-      #if CONFIG_USE_CIF_1\r
-        rk_camera_platform_data.meminfo_cif1.name = "camera_ipp_mem_1";\r
-        rk_camera_platform_data.meminfo_cif1.start =board_mem_reserve_add("camera_ipp_mem_1",MEM_CAMIPP_SIZE_CIF_1);\r
-        rk_camera_platform_data.meminfo_cif1.size= MEM_CAMIPP_SIZE_CIF_1;\r
-      #endif\r
-#endif\r
-\r
-#if (PMEM_CAM_SIZE != 0)\r
-                android_pmem_cam_pdata.start = board_mem_reserve_add("camera_pmem",PMEM_CAM_SIZE);\r
-                android_pmem_cam_pdata.size = PMEM_CAM_SIZE;\r
+#ifdef CONFIG_VIDEO_RK29_WORK_IPP\r
+    #ifdef VIDEO_RKCIF_WORK_SIMUL_OFF\r
+        rk_camera_platform_data.meminfo.name = "camera_ipp_mem";\r
+        rk_camera_platform_data.meminfo.start = board_mem_reserve_add("camera_ipp_mem",PMEM_CAMIPP_NECESSARY);\r
+        rk_camera_platform_data.meminfo.size= PMEM_CAMIPP_NECESSARY;\r
+\r
+        memcpy(&rk_camera_platform_data.meminfo_cif1,&rk_camera_platform_data.meminfo,sizeof(struct rk29camera_mem_res));\r
+    #else\r
+        rk_camera_platform_data.meminfo.name = "camera_ipp_mem_0";\r
+        rk_camera_platform_data.meminfo.start = board_mem_reserve_add("camera_ipp_mem_0",PMEM_CAMIPP_NECESSARY_CIF_0);\r
+        rk_camera_platform_data.meminfo.size= PMEM_CAMIPP_NECESSARY_CIF_0;\r
+        \r
+        rk_camera_platform_data.meminfo_cif1.name = "camera_ipp_mem_1";\r
+        rk_camera_platform_data.meminfo_cif1.start =board_mem_reserve_add("camera_ipp_mem_1",PMEM_CAMIPP_NECESSARY_CIF_1);\r
+        rk_camera_platform_data.meminfo_cif1.size= PMEM_CAMIPP_NECESSARY_CIF_1;\r
+    #endif\r
 #endif\r
 }\r
 static int rk_register_camera_devices(void)\r
 {\r
+    int i;\r
+    int host_registered_0,host_registered_1;\r
+    \r
        rk_init_camera_plateform_data();\r
-#if CONFIG_USE_CIF_0\r
-       platform_device_register(&rk_device_camera_host_0);\r
-#endif\r
-#if CONFIG_USE_CIF_1\r
-       platform_device_register(&rk_device_camera_host_1);\r
-#endif\r
-       if(rk_soc_camera_pdrv_0.name)\r
-               platform_device_register(&rk_soc_camera_pdrv_0);\r
-       if(rk_soc_camera_pdrv_1.name)\r
-               platform_device_register(&rk_soc_camera_pdrv_1);\r
-       if(((struct android_pmem_platform_data*)(android_pmem_cam_device.dev.platform_data))->size)\r
-               platform_device_register(&android_pmem_cam_device);\r
+\r
+    host_registered_0 = 0;\r
+    host_registered_1 = 0;\r
+    for (i=0; i<RK_CAM_NUM; i++) {\r
+        if (rk_camera_platform_data.register_dev[i].device_info.name) {\r
+            if (rk_camera_platform_data.register_dev[i].link_info.bus_id == RK_CAM_PLATFORM_DEV_ID_0) {\r
+                if (!host_registered_0) {\r
+                    platform_device_register(&rk_device_camera_host_0);\r
+                    host_registered_0 = 1;\r
+                }\r
+            } else if (rk_camera_platform_data.register_dev[i].link_info.bus_id == RK_CAM_PLATFORM_DEV_ID_1) {\r
+                if (!host_registered_1) {\r
+                    platform_device_register(&rk_device_camera_host_1);\r
+                    host_registered_1 = 1;\r
+                }\r
+            } \r
+        }\r
+    }\r
+\r
+    for (i=0; i<RK_CAM_NUM; i++) {\r
+        if (rk_camera_platform_data.register_dev[i].device_info.name) {\r
+            platform_device_register(&rk_camera_platform_data.register_dev[i].device_info);\r
+        }\r
+    }\r
        return 0;\r
 }\r
 \r
index d568022b23155761ec31cf1c9bfd3f25caaec7d2..f95f530eac8f53b1545b289f14a139db346b09ad 100755 (executable)
@@ -9,7 +9,7 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  */
-#if CONFIG_ARCH_RK30
+#ifdef CONFIG_ARCH_RK30
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/io.h>