diff options
| author | Daniel Hillenbrand <daniel.hillenbrand@codeworkx.de> | 2012-07-21 23:04:45 +0200 |
|---|---|---|
| committer | Daniel Hillenbrand <daniel.hillenbrand@codeworkx.de> | 2012-07-21 23:04:45 +0200 |
| commit | 0a1182796f6475b8cb2ff1781dad873a744b3197 (patch) | |
| tree | e15b5256dac226c49a25b5e24594cd638e2fec2c /arch/arm/mach-exynos/midas-camera.c | |
| parent | 633018c13fe06461d9c60692fbb114734aa37802 (diff) | |
| download | kernel_samsung_smdk4412-0a1182796f6475b8cb2ff1781dad873a744b3197.zip kernel_samsung_smdk4412-0a1182796f6475b8cb2ff1781dad873a744b3197.tar.gz kernel_samsung_smdk4412-0a1182796f6475b8cb2ff1781dad873a744b3197.tar.bz2 | |
samsung opensource update3
Diffstat (limited to 'arch/arm/mach-exynos/midas-camera.c')
| -rw-r--r-- | arch/arm/mach-exynos/midas-camera.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/arch/arm/mach-exynos/midas-camera.c b/arch/arm/mach-exynos/midas-camera.c index 587a9be..d120808 100644 --- a/arch/arm/mach-exynos/midas-camera.c +++ b/arch/arm/mach-exynos/midas-camera.c @@ -368,6 +368,10 @@ static int s5k6a3_power_on(void) } CAM_CHECK_ERR_RET(ret, "cfg mclk"); + /* VT_RESET */ + ret = gpio_direction_output(GPIO_CAM_VT_nRST, 1); + CAM_CHECK_ERR_RET(ret, "output GPIO_CAM_VT_nRST"); + /* VT_CORE_1.8V */ regulator = regulator_get(NULL, "vt_cam_1.8v"); if (IS_ERR(regulator)) @@ -375,19 +379,6 @@ static int s5k6a3_power_on(void) ret = regulator_enable(regulator); regulator_put(regulator); CAM_CHECK_ERR_RET(ret, "enable vt_cam_1.8v"); - udelay(1000); - - /* VT_RESET */ - ret = gpio_direction_output(GPIO_CAM_VT_nRST, 1); - CAM_CHECK_ERR_RET(ret, "output GPIO_CAM_VT_nRST"); - udelay(600); - - ret = gpio_direction_output(GPIO_CAM_VT_nRST, 0); - CAM_CHECK_ERR_RET(ret, "output GPIO_CAM_VT_nRST"); - udelay(600); - - ret = gpio_direction_output(GPIO_CAM_VT_nRST, 1); - CAM_CHECK_ERR_RET(ret, "output GPIO_CAM_VT_nRST"); gpio_free(GPIO_CAM_IO_EN); gpio_free(GPIO_CAM_VT_nRST); @@ -943,6 +934,7 @@ static struct s5c73m3_platform_data s5c73m3_plat = { .set_vdd_core = s5c73m3_set_vdd_core, .is_vdd_core_set = s5c73m3_is_vdd_core_set, .is_isp_reset = s5c73m3_is_isp_reset, + .power_on_off = s5c73m3_power, }; static struct i2c_board_info s5c73m3_i2c_info = { |