ARM: tegra: pluto/dalmore: set VGP4 pinmux

set the default mux to VGP4 and remove the gpio override in
board-pluto-sensors.c

Change-Id: Id08d0d53b75a67bc48df50cfe3a4fef7f1697be1
Signed-off-by: Charlie Huang <chahuang@nvidia.com>
(cherry picked from commit 5abc81df675eae63f69780d230fb54b37775d904)
Reviewed on: http://git-master/r/#change,142064
Reviewed-on: http://git-master/r/145668
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Philip Breczinski <pbreczinski@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Rebase-Id: Re79c9c8d39bb8533aaccacd4b785059c95a6f9e0

diff --git a/arch/arm/mach-tegra/board-dalmore-pinmux-t11x.h b/arch/arm/mach-tegra/board-dalmore-pinmux-t11x.h
index 0a95a1fd6e48000061179e5b181e224b2578cda0..e8ccb6a75eb3d806e0e06286a65cda5417eca829 100644 (file)
--- a/arch/arm/mach-tegra/board-dalmore-pinmux-t11x.h
+++ b/arch/arm/mach-tegra/board-dalmore-pinmux-t11x.h
@@ -62,6 +62,9 @@ static __initdata struct tegra_pingroup_config dalmore_pinmux_common[] = {
        /* VI_ALT1 pinmux */
        VI_PINMUX(GPIO_PBB0, VI_ALT3, NORMAL, NORMAL, OUTPUT, DEFAULT, DEFAULT),
 
+       /* VGP4 pinmux */
+       VI_PINMUX(GPIO_PBB4, VGP4, NORMAL, NORMAL, OUTPUT, DEFAULT, DEFAULT),
+
        /* I2C2 pinmux */
        I2C_PINMUX(GEN2_I2C_SCL, I2C2, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
        I2C_PINMUX(GEN2_I2C_SDA, I2C2, NORMAL, NORMAL, INPUT, DISABLE, DISABLE),
@@ -230,7 +233,6 @@ static struct gpio_init_pin_info init_gpio_mode_dalmore_common[] = {
        GPIO_INIT_PIN_MODE(TEGRA_GPIO_PV0, true, 0),
        GPIO_INIT_PIN_MODE(TEGRA_GPIO_PV1, true, 0),
        GPIO_INIT_PIN_MODE(TEGRA_GPIO_PBB3, false, 0),
-       GPIO_INIT_PIN_MODE(TEGRA_GPIO_PBB4, false, 0),
        GPIO_INIT_PIN_MODE(TEGRA_GPIO_PBB5, false, 0),
        GPIO_INIT_PIN_MODE(TEGRA_GPIO_PBB6, false, 0),
        GPIO_INIT_PIN_MODE(TEGRA_GPIO_PBB7, false, 0),