diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2011-05-30 17:13:03 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2012-03-23 21:11:17 -0700 |
| commit | d1dca53aee0b34be2e9352d7f64d69345c146d6d (patch) | |
| tree | e04b50a422026bef7e325cac93b09fe97c34b02c | |
| parent | 74930501cd23df825448b648435d39f910b79c05 (diff) | |
arm: tegra: ventana: ldo6 uses 1.8v always
camera needs LDO6 to be 1.8v always. the same was
done in the camera init code but was causing issues
because of recent changes in the regulator core.
fixing this issue by setting LDO6 to 1.8v at
during regulator init.
Bug 832292
Original-Change-Id: I185d83f5f31640d30c2c04acc28ccbb04f9f0557
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/34473
Reviewed-by: Pritesh Raithatha <praithatha@nvidia.com>
Reviewed-by: Abhinav Sinha <absinha@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Rebase-Id: R32a9fd66a379b201edc689d80f926cc1ef3b2f4e
| -rw-r--r-- | arch/arm/mach-tegra/board-ventana-power.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-ventana-sensors.c | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/board-ventana-power.c b/arch/arm/mach-tegra/board-ventana-power.c index 3399fdd188c4..c6ed3a387f8c 100644 --- a/arch/arm/mach-tegra/board-ventana-power.c +++ b/arch/arm/mach-tegra/board-ventana-power.c @@ -125,6 +125,7 @@ static struct tps6586x_settings sm1_config = { REGULATOR_CHANGE_STATUS | \ REGULATOR_CHANGE_VOLTAGE), \ .always_on = on, \ + .apply_uV = 1, \ }, \ .num_consumer_supplies = ARRAY_SIZE(tps658621_##_id##_supply),\ .consumer_supplies = tps658621_##_id##_supply, \ @@ -143,7 +144,7 @@ static struct regulator_init_data ldo2_data = REGULATOR_INIT(ldo2, 725, 1500, OF static struct regulator_init_data ldo3_data = REGULATOR_INIT(ldo3, 1250, 3300, OFF, NULL); static struct regulator_init_data ldo4_data = REGULATOR_INIT(ldo4, 1700, 2475, OFF, NULL); static struct regulator_init_data ldo5_data = REGULATOR_INIT(ldo5, 1250, 3300, ON, NULL); -static struct regulator_init_data ldo6_data = REGULATOR_INIT(ldo6, 1250, 1800, OFF, NULL); +static struct regulator_init_data ldo6_data = REGULATOR_INIT(ldo6, 1800, 1800, OFF, NULL); static struct regulator_init_data ldo7_data = REGULATOR_INIT(ldo7, 1250, 3300, OFF, NULL); static struct regulator_init_data ldo8_data = REGULATOR_INIT(ldo8, 1250, 3300, OFF, NULL); static struct regulator_init_data ldo9_data = REGULATOR_INIT(ldo9, 1250, 3300, OFF, NULL); diff --git a/arch/arm/mach-tegra/board-ventana-sensors.c b/arch/arm/mach-tegra/board-ventana-sensors.c index 878941d01c55..c05749184cd9 100644 --- a/arch/arm/mach-tegra/board-ventana-sensors.c +++ b/arch/arm/mach-tegra/board-ventana-sensors.c @@ -438,12 +438,6 @@ int __init ventana_camera_late_init(void) return PTR_ERR(cam_ldo6); } - ret = regulator_set_voltage(cam_ldo6, 1800*1000, 1800*1000); - if (ret){ - pr_err("%s: Failed to set ldo6 to 1.8v\n", __func__); - goto fail_put_regulator; - } - ret = regulator_enable(cam_ldo6); if (ret){ pr_err("%s: Failed to enable ldo6\n", __func__); |