Merge branch develop-3.10-next

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

diff --git a/drivers/media/video/rk_camsys/camsys_soc_rk3368.c b/drivers/media/video/rk_camsys/camsys_soc_rk3368.c
index ce664d95476e1d40157367ff95c9cf4b6e8c6309..b534386a65fcc3c46035f4b1913f54b8eabe5c16 100644 (file)
--- a/drivers/media/video/rk_camsys/camsys_soc_rk3368.c
+++ b/drivers/media/video/rk_camsys/camsys_soc_rk3368.c
@@ -1,3 +1,4 @@
+#ifdef CONFIG_ARM64
 #include "camsys_soc_priv.h"
 #include "camsys_soc_rk3368.h"
 
@@ -248,8 +249,8 @@ int camsys_rk3368_cfg (camsys_soc_cfg_t cfg_cmd, void* cfg_para)
 
         case Isp_SoftRst:         /* ddl@rock-chips.com: v0.d.0 */
         {
-            unsigned int reset;
-            reset = (unsigned int)cfg_para;
+            unsigned long reset;
+            reset = (unsigned long)cfg_para;
                        #if 0
             if (reset == 1)
                 write_cru_reg(0x318,0x40004000);
@@ -265,7 +266,7 @@ int camsys_rk3368_cfg (camsys_soc_cfg_t cfg_cmd, void* cfg_para)
                                __raw_writel(0x00,
                                             (void*)(rk_isp_base + MRV_AFM_BASE +
                                             VI_IRCL));
-                       camsys_trace(1, "Isp self soft rst: %d", reset);
+                       camsys_trace(1, "Isp self soft rst: %ld", reset);
             break;
         }
 
@@ -279,5 +280,4 @@ int camsys_rk3368_cfg (camsys_soc_cfg_t cfg_cmd, void* cfg_para)
 
     return 0;
 }
-
-
+#endif /* CONFIG_ARM64 */