rk312x:cif: 1. soft reset cif before setting cif registers

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / rk30_camera.c

diff --git a/drivers/media/video/rk30_camera.c b/drivers/media/video/rk30_camera.c
index 1991b499cc2837d20000d8ddc9dbcedd449d0a74..1747d3331748b92844d377872cddaffd2cf3f955 100755 (executable)
--- a/drivers/media/video/rk30_camera.c
+++ b/drivers/media/video/rk30_camera.c
@@ -1,12 +1,11 @@
-   
 #include <media/soc_camera.h>
 #include <media/camsys_head.h>
 #include <linux/android_pmem.h>
 #include <linux/i2c.h>
 #include <linux/of.h>
 #include <linux/of_irq.h>
-#include "../../../arch/arm/mach-rockchip/rk30_camera.h"//yzm
-#include "../../../arch/arm/mach-rockchip/rk_camera.h"//yzm
+#include "../../../arch/arm/mach-rockchip/rk30_camera.h"/*yzm*/
+#include "../../../arch/arm/mach-rockchip/rk_camera.h"/*yzm*/
 //**********yzm***********//
 #include <linux/kernel.h>
 #include <linux/of_address.h>
@@ -14,19 +13,11 @@
 #include <linux/of_fdt.h>
 #include <linux/module.h>
 
-static int rk_dts_sensor_probe(struct platform_device *pdev);
-static int rk_dts_sensor_remove(struct platform_device *pdev);
-static int rk_dts_cif_probe(struct platform_device *pdev);
-static int rk_dts_cif_remove(struct platform_device *pdev);
-
-#include "../../../arch/arm/mach-rockchip/rk_camera.c"//yzm
-
-
 static int rk_register_camera_devices(void)
 {
     int i;
     int host_registered_0,host_registered_1;
-    struct rkcamera_platform_data *new_camera;    //¶¨ÒåµÄÊÇÒ»¸ösensor½á¹¹Ìå
+    struct rkcamera_platform_data *new_camera;    
 
        //printk(KERN_EMERG "/$$$$$$$$$$$$$$$$$$$$$$//n Here I am: %s:%i-------%s()\n", __FILE__, __LINE__,__FUNCTION__);
 
@@ -41,9 +32,9 @@ static int rk_register_camera_devices(void)
 
     if (new_camera != NULL) {
         while (new_camera != NULL) {
-                       if (new_camera->dev.desc_info.host_desc.bus_id == RK_CAM_PLATFORM_DEV_ID_1) {//yzm
+                       if (new_camera->dev.desc_info.host_desc.bus_id == RK_CAM_PLATFORM_DEV_ID_1) {/*yzm*/
                 host_registered_1 = 1;
-                       } else if (new_camera->dev.desc_info.host_desc.bus_id == RK_CAM_PLATFORM_DEV_ID_0) {//yzm
+                       } else if (new_camera->dev.desc_info.host_desc.bus_id == RK_CAM_PLATFORM_DEV_ID_0) {/*yzm*/
                 host_registered_0 = 1;
             }
                        
@@ -53,25 +44,22 @@ static int rk_register_camera_devices(void)
 
     #if RK_SUPPORT_CIF0
     if (host_registered_0) {
-        platform_device_register(&rk_device_camera_host_0);//host_0 ÉÏÓÐsensor
+        platform_device_register(&rk_device_camera_host_0);//host_0 has sensor
     }   //host_device_register
     #endif
        
     #if RK_SUPPORT_CIF1
     if (host_registered_1) {
-        platform_device_register(&rk_device_camera_host_1);//host_1ÉÏÓÐsensor
+        platform_device_register(&rk_device_camera_host_1);//host_1 has sensor
     }  //host_device_register
     #endif
 
 
     if (rk_camera_platform_data.sensor_register)      
-       (rk_camera_platform_data.sensor_register)();   //µ÷ÓÃrk_sensor_register()
+       (rk_camera_platform_data.sensor_register)();   //call rk_sensor_register()
 
- #if PMEM_CAM_NECESSARY
-    platform_device_register(&android_pmem_cam_device);//???
- #endif
        return 0;
 }
 
 
-module_init(rk_register_camera_devices);//yzm
+module_init(rk_register_camera_devices);/*yzm*/