Merge branch develop-3.10

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

diff --git a/drivers/media/video/rk_camsys/camsys_soc_priv.c b/drivers/media/video/rk_camsys/camsys_soc_priv.c
index c1c22ebf7d088a11fe4c1498d8ff5a0a57995886..12b70ae98c46225f6fb1179b720757ce47350a19 100755 (executable)
--- a/drivers/media/video/rk_camsys/camsys_soc_priv.c
+++ b/drivers/media/video/rk_camsys/camsys_soc_priv.c
@@ -5,6 +5,7 @@
 
 static camsys_soc_priv_t* camsys_soc_p;
 
+#ifdef CONFIG_ARM
 #include "camsys_soc_rk3288.c"
 
 static int camsys_rk3288_cfg (camsys_soc_cfg_t cfg_cmd, void* cfg_para)
@@ -39,13 +40,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;
         }
 
@@ -61,6 +63,7 @@ static int camsys_rk3288_cfg (camsys_soc_cfg_t cfg_cmd, void* cfg_para)
 
 
 }
+#endif
 
 camsys_soc_priv_t* camsys_soc_get(void)
 {
@@ -80,8 +83,10 @@ int camsys_soc_init(void)
     }
 
     if (soc_is_rk3288()) {
+#ifdef CONFIG_ARM
         strlcpy(camsys_soc_p->name,"camsys_rk3288",31);
         camsys_soc_p->soc_cfg = camsys_rk3288_cfg;
+#endif
     } else {
         camsys_err("camsys isn't support soc: 0x%lx!",rockchip_soc_id);
         goto fail;