From 23e1e57ae5497576d14683fc0ce2d3dd7f98bbc2 Mon Sep 17 00:00:00 2001 From: Zhang Yunlong Date: Sat, 24 Feb 2018 14:20:05 +0800 Subject: [PATCH] Revert commit "camera: rockchip: camsys_drv v0.0x22.5" Change-Id: I08774bc7d7edc9e9ca38da7415b8e3a976afe394 Signed-off-by: Zhang Yunlong --- drivers/media/video/rk_camsys/camsys_gpio.h | 2 +- drivers/media/video/rk_camsys/camsys_internal.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/rk_camsys/camsys_gpio.h b/drivers/media/video/rk_camsys/camsys_gpio.h index b19437403741..4858cde26ef5 100644 --- a/drivers/media/video/rk_camsys/camsys_gpio.h +++ b/drivers/media/video/rk_camsys/camsys_gpio.h @@ -3,7 +3,7 @@ #define __RKCAMSYS_GPIO_H__ #if defined(CONFIG_ARCH_ROCKCHIP) -#define RK30_PIN0_PA0 (1000) +#define RK30_PIN0_PA0 (0) #define NUM_GROUP (32) #define GPIO_BANKS (9) #endif diff --git a/drivers/media/video/rk_camsys/camsys_internal.h b/drivers/media/video/rk_camsys/camsys_internal.h index 63f06803697c..f15c42bb98e1 100644 --- a/drivers/media/video/rk_camsys/camsys_internal.h +++ b/drivers/media/video/rk_camsys/camsys_internal.h @@ -196,9 +196,11 @@ 1) v0.0x21.9 may not fix all the case of iommu issue caused by the unexpected termination of process cameraserver, so we force to release all iommu resource in |.release| of fops aganin if needed. +*v0.0x27.0: + 1) revert v0.0x22.5. */ -#define CAMSYS_DRIVER_VERSION KERNEL_VERSION(0, 0x26, 0) +#define CAMSYS_DRIVER_VERSION KERNEL_VERSION(0, 0x27, 0) #define CAMSYS_PLATFORM_DRV_NAME "RockChip-CamSys" #define CAMSYS_PLATFORM_MARVIN_NAME "Platform_MarvinDev"