diff options
author | Rakesh Bodla <rbodla@nvidia.com> | 2011-02-28 22:08:13 +0530 |
---|---|---|
committer | Varun Colbert <vcolbert@nvidia.com> | 2011-02-28 14:03:34 -0800 |
commit | 46fad22837d5b873704a8e422d4966d2ff72d99d (patch) | |
tree | 00d0089b827d236e9ccf3c2a58097b44902ff92d | |
parent | c755dcd29cf7d7034623849239c94bad7eca6a00 (diff) |
arm: tegra: ventana: Enabling suspend on USB1 & USB3
Enabling power down when device suspends for USB1 and USB3.
Also added the platform data structure which is used
when USB suspends.
Bug 770041
Reviewed-on: http://git-master/r/20030
(cherry picked from commit d7ca0c65fa2930ac60c7b85d8be6178b0f0ecc32)
Change-Id: I0b4c6b2f4c727e82bb4ce54d19a15951d6543e96
Reviewed-on: http://git-master/r/20970
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
-rwxr-xr-x | arch/arm/mach-tegra/board-ventana-power.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-ventana.c | 24 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-ventana.h | 4 |
3 files changed, 27 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/board-ventana-power.c b/arch/arm/mach-tegra/board-ventana-power.c index 696e43d32074..3ab56b39b926 100755 --- a/arch/arm/mach-tegra/board-ventana-power.c +++ b/arch/arm/mach-tegra/board-ventana-power.c @@ -164,10 +164,10 @@ static struct tps6586x_subdev_info tps_devs[] = { }; static struct tps6586x_platform_data tps_platform = { - .irq_base = TEGRA_NR_IRQS, + .irq_base = TPS6586X_INT_BASE, .num_subdevs = ARRAY_SIZE(tps_devs), .subdevs = tps_devs, - .gpio_base = TEGRA_NR_GPIOS, + .gpio_base = TPS6586X_GPIO_BASE, }; static struct i2c_board_info __initdata ventana_regulators[] = { diff --git a/arch/arm/mach-tegra/board-ventana.c b/arch/arm/mach-tegra/board-ventana.c index ee213cb7b929..1a8b70c3e4c1 100644 --- a/arch/arm/mach-tegra/board-ventana.c +++ b/arch/arm/mach-tegra/board-ventana.c @@ -344,7 +344,7 @@ static struct tegra_ulpi_config ventana_ehci2_ulpi_phy_config = { static struct tegra_ehci_platform_data ventana_ehci2_ulpi_platform_data = { .operating_mode = TEGRA_USB_HOST, - .power_down_on_bus_suspend = 0, + .power_down_on_bus_suspend = 1, .phy_config = &ventana_ehci2_ulpi_phy_config, }; @@ -663,11 +663,27 @@ static int __init ventana_touch_init_atmel(void) } #endif +static struct usb_phy_plat_data tegra_usb_phy_pdata[] = { + [0] = { + .instance = 0, + .vbus_irq = TPS6586X_INT_BASE + TPS6586X_INT_USB_DET, + .vbus_gpio = TEGRA_GPIO_PD0, + }, + [1] = { + .instance = 1, + .vbus_gpio = -1, + }, + [2] = { + .instance = 2, + .vbus_gpio = TEGRA_GPIO_PD3, + }, +}; + static struct tegra_ehci_platform_data tegra_ehci_pdata[] = { [0] = { .phy_config = &utmi_phy_config[0], .operating_mode = TEGRA_USB_HOST, - .power_down_on_bus_suspend = 0, + .power_down_on_bus_suspend = 1, }, [1] = { .phy_config = &ulpi_phy_config, @@ -677,7 +693,7 @@ static struct tegra_ehci_platform_data tegra_ehci_pdata[] = { [2] = { .phy_config = &utmi_phy_config[1], .operating_mode = TEGRA_USB_HOST, - .power_down_on_bus_suspend = 0, + .power_down_on_bus_suspend = 1, }, }; @@ -767,6 +783,8 @@ static void ventana_usb_init(void) char *src = NULL; int i; + tegra_usb_phy_init(tegra_usb_phy_pdata, ARRAY_SIZE(tegra_usb_phy_pdata)); + tegra_otg_device.dev.platform_data = &tegra_otg_pdata; platform_device_register(&tegra_otg_device); diff --git a/arch/arm/mach-tegra/board-ventana.h b/arch/arm/mach-tegra/board-ventana.h index d12b24597251..eeaa22629940 100644 --- a/arch/arm/mach-tegra/board-ventana.h +++ b/arch/arm/mach-tegra/board-ventana.h @@ -49,4 +49,8 @@ int ventana_emc_init(void); #define CAM3_LDO_SHUTDN_L_GPIO (TCA6416_GPIO_BASE + 11) /* gpio11 */ #define CAM_I2C_MUX_RST_GPIO (TCA6416_GPIO_BASE + 15) /* gpio15 */ +/* Interrupt numbers from external peripherals */ +#define TPS6586X_INT_BASE TEGRA_NR_IRQS +#define TPS6586X_INT_END (TPS6586X_INT_BASE + 32) + #endif |