shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

camsys_drv: fix compilation error on arm64

Browse Source
This commit is contained in:
黄涛
2014-10-23 17:03:17 +08:00
parent febe90b54b
commit 3cd59a2004
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/video/rk_camsys/camsys_gpio.h
View File

@@ -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)

3
drivers/media/video/rk_camsys/camsys_internal.h
View File

@@ -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>

4
drivers/media/video/rk_camsys/camsys_soc_priv.c
View File

@@ -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;