tegra: whistler: fix usb1 vbus gpio
Alexandre Courbot [Mon, 28 Nov 2011 05:38:31 +0000 (14:38 +0900)]
fix usb1 physical platform data to use the right gpio from the TCA6416
gpio expander.

Bug 884315
Change-Id: I8e814613a6caf547a14923f87afe91ccd877b827
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Reviewed-on: http://git-master/r/66875
Reviewed-by: Lokesh Pathak <lpathak@nvidia.com>
Tested-by: Lokesh Pathak <lpathak@nvidia.com>

arch/arm/mach-tegra/board-whistler-sensors.c
arch/arm/mach-tegra/board-whistler.c
arch/arm/mach-tegra/board-whistler.h

index c3ce1df..5177770 100644 (file)
@@ -47,6 +47,7 @@
 
 #include "gpio-names.h"
 #include "cpu-tegra.h"
+#include "board-whistler.h"
 
 #define CAMERA1_PWDN_GPIO              TEGRA_GPIO_PT2
 #define CAMERA1_RESET_GPIO             TEGRA_GPIO_PD2
@@ -56,7 +57,6 @@
 #define CAMERA_FLASH_EN1_GPIO          TEGRA_GPIO_PBB4
 #define CAMERA_FLASH_EN2_GPIO          TEGRA_GPIO_PA0
 
-#define TCA6416_GPIO_BASE              (TEGRA_NR_GPIOS)
 #define FUSE_POWER_EN_GPIO             (TCA6416_GPIO_BASE + 2)
 
 #define ADXL34X_IRQ_GPIO               TEGRA_GPIO_PAA1
index c27ec1e..ec4bea9 100644 (file)
@@ -60,6 +60,8 @@
 #include "pm.h"
 #include "board-whistler-baseband.h"
 
+#define USB1_VBUS_GPIO TCA6416_GPIO_BASE
+
 static struct plat_serial8250_port debug_uart_platform_data[] = {
        {
                .membase        = IO_ADDRESS(TEGRA_UARTA_BASE),
@@ -408,7 +410,7 @@ static struct usb_phy_plat_data tegra_usb_phy_pdata[] = {
        [0] = {
                        .instance = 0,
                        .vbus_irq = MAX8907C_INT_BASE + MAX8907C_IRQ_VCHG_DC_R,
-                       .vbus_gpio = TEGRA_GPIO_PN6,
+                       .vbus_gpio = USB1_VBUS_GPIO,
        },
        [1] = {
                        .instance = 1,
index 8ceb5dd..a31be96 100644 (file)
@@ -33,4 +33,7 @@ int whistler_emc_init(void);
 /* Audio-related GPIOs */
 #define TEGRA_GPIO_HP_DET              TEGRA_GPIO_PW3
 
+/* TCA6416 GPIO expander */
+#define TCA6416_GPIO_BASE              (TEGRA_NR_GPIOS)
+
 #endif