From: Jeongtae Park Date: Sat, 3 Jun 2017 05:20:34 +0000 (+0900) Subject: [COMMON] media: fimc-is2: don't control a regulator for univ7885(code sync) X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4cb280e0d79c7d1e0b4b5a164607bfc2c89839a2;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [COMMON] media: fimc-is2: don't control a regulator for univ7885(code sync) PR JIRA ID : CPR-38 Change-Id: I527c684b3532aa75a5fb102e25027339da7bdaa2 Signed-off-by: Jeongtae Park --- diff --git a/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/modules/fimc-is-device-module-2p6.c b/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/modules/fimc-is-device-module-2p6.c index 95fdd11cf0ad..a1c49c43e335 100644 --- a/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/modules/fimc-is-device-module-2p6.c +++ b/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/modules/fimc-is-device-module-2p6.c @@ -316,7 +316,9 @@ static int sensor_module_2p6_power_setpin_with_af(struct device *dev, if (gpio_is_valid(gpio_cam_avdd_en)) { SET_PIN(pdata, SENSOR_SCENARIO_NORMAL, GPIO_SCENARIO_OFF, gpio_cam_avdd_en, "pdaf gpio_cam_avdd_en", PIN_OUTPUT, 0, 100); } else { +#if !defined (CONFIG_SOC_EXYNOS7885) SET_PIN(pdata, SENSOR_SCENARIO_NORMAL, GPIO_SCENARIO_OFF, gpio_none, "VDDA_2.8V_CAM", PIN_REGULATOR, 0, 100); +#endif } /* READ_ROM - POWER ON */