diff options
| author | Chandler Zhang <chazhang@nvidia.com> | 2012-06-21 11:32:15 +0800 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2012-07-09 15:45:16 -0700 |
| commit | 9485dcd737fbcb2cd39d153a59d0d8405b5a6ed6 (patch) | |
| tree | 41232cc657a66912161787cd4a50c1ce2d0b8949 /arch/arm/mach-tegra/board-kai.c | |
| parent | 9bcf005a7494bb9890fd2bde02889e2ef168c289 (diff) | |
arm: tegra: kai: use regulator to control vbus
Use regulator instead of USB OTG callback to control USB VBUS.
Bug 997805
Change-Id: Icd2869f51e312c52b272a6e32fa8c7ab8763a5ac
Signed-off-by: Chandler Zhang <chazhang@nvidia.com>
Reviewed-on: http://git-master/r/112900
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-kai.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-kai.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-kai.c b/arch/arm/mach-tegra/board-kai.c index ac8a1f87fa60..bf4ae415072d 100644 --- a/arch/arm/mach-tegra/board-kai.c +++ b/arch/arm/mach-tegra/board-kai.c @@ -1,7 +1,7 @@ /* * arch/arm/mach-tegra/board-kai.c * - * Copyright (c) 2012, NVIDIA Corporation. + * Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -304,11 +304,17 @@ static struct regulator_consumer_supply smb349_vbus_supply[] = { REGULATOR_SUPPLY("usb_bat_chg", NULL), }; +static struct regulator_consumer_supply smb349_otg_vbus_supply[] = { + REGULATOR_SUPPLY("usb_vbus_otg", NULL), +}; + static struct smb349_charger_platform_data smb349_charger_pdata = { .max_charge_current_mA = 1000, .charging_term_current_mA = 100, .consumer_supplies = smb349_vbus_supply, .num_consumer_supplies = ARRAY_SIZE(smb349_vbus_supply), + .otg_consumer_supplies = smb349_otg_vbus_supply, + .num_otg_consumer_supplies = ARRAY_SIZE(smb349_otg_vbus_supply), }; static struct i2c_board_info kai_i2c4_smb349_board_info[] = { @@ -735,7 +741,7 @@ static struct tegra_usb_platform_data tegra_ehci1_utmi_pdata = { .op_mode = TEGRA_USB_OPMODE_HOST, .u_data.host = { .vbus_gpio = -1, - .vbus_reg = NULL, + .vbus_reg = "usb_vbus_otg", .hot_plug = true, .remote_wakeup_supported = true, .power_off_on_suspend = true, |