diff options
| author | Charlie Huang <chahuang@nvidia.com> | 2012-09-16 15:02:06 -0700 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-10-26 19:45:44 -0700 |
| commit | 1cd85b9e2a6436975966377224c71b9070deb1ce (patch) | |
| tree | 55625ee61bc2ac092e698937df7465289f68ec83 /arch/arm/mach-tegra/board-dalmore-power.c | |
| parent | 79c986c47a807fe59076e841b19742a330f83aaa (diff) | |
ARM: tegra: dalmore/pluto: sensor: enable flash
Added AS3648 support in board-dalmore-sensors.c along with its
platform data.
Also added the power rail names for as3648 in the power rail table.
Modified the pinmux table by setting PBB4 to VGP4.
Enabled max77665 device in board-pluto-sensors.c, updated max77665-flash
platform data.
On pluto, modified GPIO_PBB3 mux setting to enable VGP3 output. Set
max77665 flash trigger-by-torch setting, so flash can be triggered
without board rework. At the mean time, the flash-over-camera is still
reserved.
bug 1048411
bug 1035551
Change-Id: Ie378c5b528ee9efc1c81dd2617baaa80a48756e0
Signed-off-by: Charlie Huang <chahuang@nvidia.com>
(cherry picked from commit 8e7c01d3e297eada59fe32c9c7ad3810a17d3a39)
Reviewed on: http://git-master/r/#change,133126
(cherry picked from commit d3b940690c230c1c515533bd98bed67b76b0e580)
Reviewed on: http://git-master/r/#change,139122
(cherry picked from commit 27ff846a68dee8936820d48d50f71e4833a8b6ef)
Reviewed on: http://git-master/r/#change,139962
Reviewed-on: http://git-master/r/147073
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-dalmore-power.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-dalmore-power.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-dalmore-power.c b/arch/arm/mach-tegra/board-dalmore-power.c index 74da766e7226..b0b1e5aac0c2 100644 --- a/arch/arm/mach-tegra/board-dalmore-power.c +++ b/arch/arm/mach-tegra/board-dalmore-power.c @@ -75,6 +75,7 @@ static struct regulator_consumer_supply tps65090_dcdc2_supply[] = { REGULATOR_SUPPLY("vdd_sys_dtv_3v3", NULL), REGULATOR_SUPPLY("vcc", "0-007c"), REGULATOR_SUPPLY("vcc", "0-0030"), + REGULATOR_SUPPLY("vin", "2-0030"), }; static struct regulator_consumer_supply tps65090_dcdc3_supply[] = { @@ -760,12 +761,14 @@ static struct regulator_consumer_supply fixed_reg_avdd_usb_hdmi_supply[] = { static struct regulator_consumer_supply fixed_reg_en_1v8_cam_supply[] = { REGULATOR_SUPPLY("dvdd_cam", NULL), REGULATOR_SUPPLY("vdd_cam_1v8", NULL), + REGULATOR_SUPPLY("vi2c", "2-0030"), }; /* EN_CAM_1v8 on e1611 From PMU GP6 */ static struct regulator_consumer_supply fixed_reg_en_1v8_cam_e1611_supply[] = { REGULATOR_SUPPLY("dvdd_cam", NULL), REGULATOR_SUPPLY("vdd_cam_1v8", NULL), + REGULATOR_SUPPLY("vi2c", "2-0030"), }; static struct regulator_consumer_supply fixed_reg_vdd_hdmi_5v0_supply[] = { |