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-pluto-pinmux.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-pluto-pinmux.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-pluto-pinmux.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-pluto-pinmux.c b/arch/arm/mach-tegra/board-pluto-pinmux.c index bd84d1708df4..595659fd92ba 100644 --- a/arch/arm/mach-tegra/board-pluto-pinmux.c +++ b/arch/arm/mach-tegra/board-pluto-pinmux.c @@ -165,7 +165,6 @@ static __initdata struct tegra_pingroup_config pluto_pinmux_set_nontristate[] = DEFAULT_PINMUX(ULPI_DATA7, ULPI, NORMAL, NORMAL, OUTPUT), DEFAULT_PINMUX(GPIO_PBB3, RSVD3, PULL_DOWN, NORMAL, OUTPUT), - DEFAULT_PINMUX(GPIO_PBB4, RSVD3, PULL_DOWN, NORMAL, OUTPUT), DEFAULT_PINMUX(GPIO_PBB5, RSVD3, PULL_DOWN, NORMAL, OUTPUT), DEFAULT_PINMUX(GPIO_PBB6, RSVD3, PULL_DOWN, NORMAL, OUTPUT), DEFAULT_PINMUX(GPIO_PBB7, RSVD3, PULL_DOWN, NORMAL, OUTPUT), |