summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPreetham Chandru R <pchandru@nvidia.com>2012-10-05 18:25:50 +0530
committerMatthew Pedro <mapedro@nvidia.com>2012-10-10 10:34:43 -0700
commit1a2a5beb5de03cb58e4a37fa72193a8e662e9b22 (patch)
tree299f018973391dc63887a3ed55d3946a1b9cc1f0
parentb02a1cb7dbb6b0815ddd8e104ad8819e847947a0 (diff)
ARM: tegra: ventana: disable usb1 vbus gpio
disable the usb1 vbus gpio in kernel and not depend on bootloader to disable the vbus initially. Currently, the kernel enables and disables the vbus when the otg is configured to host mode, but when the system boots with no cable connected the kernel relies on the bootloader to turn the vbus off. This CL removes that dependency. Bug 1047048 Signed-off-by: Preetham Chandru R <pchandru@nvidia.com> Reviewed-on: http://git-master/r/#change,141970 (cherry picked from commit c3461995dd156968d766ec05879fd1097221ceb8) Change-Id: I96c1f4b97a2cafdfd498b591647200d26298a43b Reviewed-on: http://git-master/r/142839 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Kiran Adduri <kadduri@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/board-ventana-pinmux.c1
-rw-r--r--arch/arm/mach-tegra/board-ventana.h3
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-ventana-pinmux.c b/arch/arm/mach-tegra/board-ventana-pinmux.c
index eb371384ed4c..43b4b75878a2 100644
--- a/arch/arm/mach-tegra/board-ventana-pinmux.c
+++ b/arch/arm/mach-tegra/board-ventana-pinmux.c
@@ -181,6 +181,7 @@ static struct tegra_gpio_table gpio_table[] = {
{ .gpio = TEGRA_GPIO_HP_DET, .enable = true },
{ .gpio = TEGRA_GPIO_INT_MIC_EN, .enable = true },
{ .gpio = TEGRA_GPIO_EXT_MIC_EN, .enable = true },
+ { .gpio = TEGRA_GPIO_USB1_VBUS, .enable = false },
};
int __init ventana_pinmux_init(void)
diff --git a/arch/arm/mach-tegra/board-ventana.h b/arch/arm/mach-tegra/board-ventana.h
index b8d8040d187b..8ebf4c9b3c4a 100644
--- a/arch/arm/mach-tegra/board-ventana.h
+++ b/arch/arm/mach-tegra/board-ventana.h
@@ -87,6 +87,9 @@ int ventana_cam_fixed_voltage_regulator_init(void);
#define TEGRA_GPIO_INT_MIC_EN TEGRA_GPIO_PX0
#define TEGRA_GPIO_EXT_MIC_EN TEGRA_GPIO_PX1
+/* Usb1 vbus GPIO */
+#define TEGRA_GPIO_USB1_VBUS TEGRA_GPIO_PD0
+
/* AC detect GPIO */
#define AC_PRESENT_GPIO TEGRA_GPIO_PV3