projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ca42951)
[COMMON] media: fimc-is2: don't control a regulator for univ7885(code sync)
authorJeongtae Park <jtp.park@samsung.com>
Sat, 3 Jun 2017 05:20:34 +0000 (14:20 +0900)
committerSunyoung Kang <sy0816.kang@samsung.com>
Mon, 23 Jul 2018 08:05:35 +0000 (17:05 +0900)
PR JIRA ID : CPR-38

Change-Id: I527c684b3532aa75a5fb102e25027339da7bdaa2
Signed-off-by: Jeongtae Park <jtp.park@samsung.com>
drivers/media/platform/exynos/fimc-is2/sensor/module_framework/modules/fimc-is-device-module-2p6.c patch | blob | blame | history

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 95fdd11cf0ad79e4d18fde3350dc03cb5245232f..a1c49c43e33579c1089cb0d05b6d4a1de8ba1cdb 100644 (file)
--- 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 */