camsys_drv: v0.0x11.0

diff --git a/drivers/media/video/rk_camsys/camsys_soc_priv.c b/drivers/media/video/rk_camsys/camsys_soc_priv.c
index c1c22ebf7d088a11fe4c1498d8ff5a0a57995886..7d62386ee2eaba82b06ae70b14cd6ac4cc0cdfbc 100755 (executable)
--- a/drivers/media/video/rk_camsys/camsys_soc_priv.c
+++ b/drivers/media/video/rk_camsys/camsys_soc_priv.c
@@ -39,13 +39,14 @@ static int camsys_rk3288_cfg (camsys_soc_cfg_t cfg_cmd, void* cfg_para)
 
         case Isp_SoftRst:         /* ddl@rock-chips.com: v0.d.0 */
         {
-            para_int = (unsigned int*)cfg_para;
+            unsigned int reset;
+            reset = (unsigned int)cfg_para;
 
-            if (para_int)
+            if (reset == 1)
                 cru_writel(0x40004000,0x1d0);
             else 
                 cru_writel(0x40000000,0x1d0);
-            camsys_trace(1, "Isp_SoftRst: %d",para_int);
+            camsys_trace(1, "Isp_SoftRst: %d",reset);
             break;
         }
 

diff --git a/drivers/media/video/rk_camsys/camsys_soc_rk3288.c b/drivers/media/video/rk_camsys/camsys_soc_rk3288.c
index 41048d950a8e495b42147fe95ff5c34cbd64e060..a1d008f2b4affac02cbefdd5af35a9a8215316b2 100755 (executable)
--- a/drivers/media/video/rk_camsys/camsys_soc_rk3288.c
+++ b/drivers/media/video/rk_camsys/camsys_soc_rk3288.c
@@ -60,12 +60,12 @@ static int camsys_rk3288_mipiphy0_wr_reg(unsigned char addr, unsigned char data)
     }
     return 0;
 }
-
+#if 0
 static int camsys_rk3288_mipiphy0_rd_reg(unsigned char addr)
 {
     return read_grf_reg(GRF_SOC_STATUS21);
 }
-
+#endif
 static int camsys_rk3288_mipiphy1_wr_reg(unsigned int phy_virt,unsigned char addr, unsigned char data)
 {