From: hxy Date: Mon, 31 Dec 2012 03:03:22 +0000 (+0800) Subject: rk3168: ds1006h add front/back camera support X-Git-Tag: firefly_0821_release~8028 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4cba80c48857609097ec845da5d84abd179f905a;p=firefly-linux-kernel-4.4.55.git rk3168: ds1006h add front/back camera support --- diff --git a/arch/arm/configs/rk3168_ds1006h_defconfig b/arch/arm/configs/rk3168_ds1006h_defconfig index d2170c6fa099..44d37c333ce9 100644 --- a/arch/arm/configs/rk3168_ds1006h_defconfig +++ b/arch/arm/configs/rk3168_ds1006h_defconfig @@ -288,7 +288,7 @@ CONFIG_MEDIA_SUPPORT=y CONFIG_VIDEO_DEV=y CONFIG_SOC_CAMERA=y CONFIG_SOC_CAMERA_OV2659=y -CONFIG_SOC_CAMERA_OV5642=y +CONFIG_SOC_CAMERA_OV5640=y CONFIG_VIDEO_RK29=y CONFIG_VIDEO_RK29_CAMMEM_ION=y CONFIG_ION=y diff --git a/arch/arm/mach-rk30/board-rk3168-ds1006h-camera.c b/arch/arm/mach-rk30/board-rk3168-ds1006h-camera.c index 3a166b8d6526..aa83cacae906 100644 --- a/arch/arm/mach-rk30/board-rk3168-ds1006h-camera.c +++ b/arch/arm/mach-rk30/board-rk3168-ds1006h-camera.c @@ -74,7 +74,7 @@ #define CONFIG_SENSOR_ORIENTATION_1 90 #define CONFIG_SENSOR_POWER_PIN_1 INVALID_GPIO #define CONFIG_SENSOR_RESET_PIN_1 INVALID_GPIO -#define CONFIG_SENSOR_POWERDN_PIN_1 RK30_PIN3_PB5 +#define CONFIG_SENSOR_POWERDN_PIN_1 RK30_PIN3_PB4 #define CONFIG_SENSOR_FALSH_PIN_1 INVALID_GPIO #define CONFIG_SENSOR_POWERACTIVE_LEVEL_1 RK29_CAM_POWERACTIVE_L #define CONFIG_SENSOR_RESETACTIVE_LEVEL_1 RK29_CAM_RESETACTIVE_L