From: 黄涛 <huangtao@rock-chips.com>
Date: Thu, 23 Oct 2014 09:03:17 +0000 (+0800)
Subject: camsys_drv: fix compilation error on arm64
X-Git-Tag: firefly_0821_release~4158^2~601
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3cd59a2004061e9fb49f7a0df4c6f9ed333c92fb;p=firefly-linux-kernel-4.4.55.git

camsys_drv: fix compilation error on arm64
---

diff --git a/drivers/media/video/rk_camsys/camsys_gpio.h b/drivers/media/video/rk_camsys/camsys_gpio.h
index 6d6e81e1fe4e..3c282ea3f53e 100755
--- a/drivers/media/video/rk_camsys/camsys_gpio.h
+++ b/drivers/media/video/rk_camsys/camsys_gpio.h
@@ -1,8 +1,7 @@
 #ifndef __RKCAMSYS_GPIO_H__
 #define __RKCAMSYS_GPIO_H__
 
-//#include <mach/gpio.h>
-#include <asm/gpio.h>
+#include <linux/gpio.h>
 #if defined(CONFIG_ARCH_ROCKCHIP)
 #define RK30_PIN0_PA0 (0)
 #define NUM_GROUP 	(32)
diff --git a/drivers/media/video/rk_camsys/camsys_internal.h b/drivers/media/video/rk_camsys/camsys_internal.h
index c0c413b80484..455505646979 100755
--- a/drivers/media/video/rk_camsys/camsys_internal.h
+++ b/drivers/media/video/rk_camsys/camsys_internal.h
@@ -28,6 +28,7 @@
 #include <linux/mutex.h>
 #include <linux/regulator/machine.h>
 #include <linux/log2.h>
+#include <linux/gpio.h>
 //#include <mach/io.h>
 //#include <mach/gpio.h>
 //#include <mach/iomux.h>
@@ -36,8 +37,6 @@
 #include <linux/rockchip/iomap.h>
 #include <linux/rockchip/grf.h>
 
-#include <asm/gpio.h>
-#include <asm/system.h>	
 #include <asm/uaccess.h>
 
 #include <linux/of.h>
diff --git a/drivers/media/video/rk_camsys/camsys_soc_priv.c b/drivers/media/video/rk_camsys/camsys_soc_priv.c
index 7d62386ee2ea..12b70ae98c46 100755
--- 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)
@@ -62,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)
 {
@@ -81,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;