diff options
| -rw-r--r-- | arch/arm/mach-tegra/board-whistler-sensors.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-whistler.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-whistler.h | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-whistler-sensors.c b/arch/arm/mach-tegra/board-whistler-sensors.c index c3ce1df46373..5177770f4cbe 100644 --- a/arch/arm/mach-tegra/board-whistler-sensors.c +++ b/arch/arm/mach-tegra/board-whistler-sensors.c @@ -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 diff --git a/arch/arm/mach-tegra/board-whistler.c b/arch/arm/mach-tegra/board-whistler.c index c27ec1edc5a0..ec4bea9df79a 100644 --- a/arch/arm/mach-tegra/board-whistler.c +++ b/arch/arm/mach-tegra/board-whistler.c @@ -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, diff --git a/arch/arm/mach-tegra/board-whistler.h b/arch/arm/mach-tegra/board-whistler.h index 8ceb5dd53f8d..a31be96e915b 100644 --- a/arch/arm/mach-tegra/board-whistler.h +++ b/arch/arm/mach-tegra/board-whistler.h @@ -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 |