camera: sensor platform device register in rk29_camera.c

diff --git a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
index e2aa684824d9bca77799b1c3be41bb4a20f585c4..6f8d695a0314ce2b866d1ec60bf14008b6f61d20 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
+++ b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
@@ -2818,31 +2818,9 @@ static struct platform_device *devices[] __initdata = {
     #if (CONFIG_SENSOR_IIC_ADDR_1 != 0x00)
        &rk29_soc_camera_pdrv_1,
        #endif
-    #ifdef CONFIG_SENSOR_01
-    #if (CONFIG_SENSOR_IIC_ADDR_01 != 0x00)
-       &rk29_soc_camera_pdrv_01,
-       #endif
-    #endif
-    #ifdef CONFIG_SENSOR_02
-    #if (CONFIG_SENSOR_IIC_ADDR_02 != 0x00)
-       &rk29_soc_camera_pdrv_02,
-       #endif
-    #endif
-    #ifdef CONFIG_SENSOR_11
-    #if (CONFIG_SENSOR_IIC_ADDR_11 != 0x00)
-       &rk29_soc_camera_pdrv_11,
-       #endif
-    #endif
-    #ifdef CONFIG_SENSOR_12
-    #if (CONFIG_SENSOR_IIC_ADDR_12 != 0x00)
-       &rk29_soc_camera_pdrv_12,
-       #endif
-    #endif
-
     #if (PMEM_CAM_SIZE > 0)
        &android_pmem_cam_device,
        #endif
-    
 #endif
 #if PMEM_SKYPE_SIZE > 0
        &android_pmem_skype_device,

diff --git a/arch/arm/mach-rk29/board-rk29-k97.c b/arch/arm/mach-rk29/board-rk29-k97.c
index 619d810b8fcbac267ad513cb88ca1e0b81f9eaa5..ab32e956dc62809929304d2991a25abc8262a8bc 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-k97.c
+++ b/arch/arm/mach-rk29/board-rk29-k97.c
@@ -2785,27 +2785,7 @@ static struct platform_device *devices[] __initdata = {
        #endif
     #if (CONFIG_SENSOR_IIC_ADDR_1 != 0x00)
        &rk29_soc_camera_pdrv_1,
-       #endif
-    #ifdef CONFIG_SENSOR_01
-    #if (CONFIG_SENSOR_IIC_ADDR_01 != 0x00)
-       &rk29_soc_camera_pdrv_01,
-       #endif
-    #endif
-    #ifdef CONFIG_SENSOR_02
-    #if (CONFIG_SENSOR_IIC_ADDR_02 != 0x00)
-       &rk29_soc_camera_pdrv_02,
-       #endif
-    #endif
-    #ifdef CONFIG_SENSOR_11
-    #if (CONFIG_SENSOR_IIC_ADDR_11 != 0x00)
-       &rk29_soc_camera_pdrv_11,
-       #endif
-    #endif
-    #ifdef CONFIG_SENSOR_12
-    #if (CONFIG_SENSOR_IIC_ADDR_12 != 0x00)
-       &rk29_soc_camera_pdrv_12,
-       #endif
-    #endif
+       #endif   
 
     #if (PMEM_CAM_SIZE > 0)
        &android_pmem_cam_device,

diff --git a/drivers/media/video/rk29_camera.c b/drivers/media/video/rk29_camera.c
index 91ff7836ebc8243c568439ca5880d0e67667b075..9fbd3037d1641f958d47401d2e5be05aa294bf4a 100755 (executable)
--- a/drivers/media/video/rk29_camera.c
+++ b/drivers/media/video/rk29_camera.c
@@ -57,7 +57,7 @@
 #define PMEM_CAMIPP_NECESSARY    0x800000\r
 #endif\r
 \r
-#if CONFIG_VIDEO_RK29_CAMMEM_ION\r
+#ifdef CONFIG_VIDEO_RK29_CAMMEM_ION\r
 #undef PMEM_CAM_NECESSARY\r
 #define PMEM_CAM_NECESSARY   0x00000000\r
 #endif\r
@@ -2093,6 +2093,38 @@ static struct platform_device android_pmem_cam_device = {
        },\r
 };\r
 #endif\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
+       return 0;\r
+}\r
+\r
+module_init(rk_register_camera_devices);\r
+\r
+\r
 #endif\r
 \r
 #endif //#ifdef CONFIG_VIDEO_RK29\r