diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2011-06-27 15:56:01 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:47:12 -0800 |
| commit | f978c31adf185dd2ecea508986ecbc8329a104b3 (patch) | |
| tree | 55066ab204273dfbf1d65cc7e612675109dd525a /arch | |
| parent | a553bef5c7cd54a688d6ba8f2688e9e16f91f3db (diff) | |
arm: tegra: enterprise: Add VBUS regulator information
Adding VBUS regulator information to activate the VBUS.
bug 833736
Original-Change-Id: I1cf4c2eb112a6ea26b74c3d1a2754019a47533fd
Reviewed-on: http://git-master/r/38500
Tested-by: Mallikarjun Kasoju <mkasoju@nvidia.com>
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Reviewed-by: Hanumanth Venkateswa Moganty <vmoganty@nvidia.com>
Rebase-Id: R1bf2e329910d76bde5f0897f1f84147d1db1952a
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise-power.c | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise-power.c b/arch/arm/mach-tegra/board-enterprise-power.c index 3129162ef841..16aaebc347b7 100644 --- a/arch/arm/mach-tegra/board-enterprise-power.c +++ b/arch/arm/mach-tegra/board-enterprise-power.c @@ -131,8 +131,12 @@ static struct regulator_consumer_supply tps80031_ldousb_supply[] = { REGULATOR_SUPPLY("unused_ldousb", NULL), }; +static struct regulator_consumer_supply tps80031_vbus_supply[] = { + REGULATOR_SUPPLY("usb_vbus", NULL), +}; + #define TPS_PDATA_INIT(_id, _minmv, _maxmv, _supply_reg, _always_on, \ - _boot_on, _apply_uv, _init_uV, _init_enable, _init_apply) \ + _boot_on, _apply_uv, _init_uV, _init_enable, _init_apply, _flags) \ static struct tps80031_regulator_platform_data pdata_##_id = { \ .regulator = { \ .constraints = { \ @@ -155,24 +159,26 @@ static struct regulator_consumer_supply tps80031_ldousb_supply[] = { .init_uV = _init_uV * 1000, \ .init_enable = _init_enable, \ .init_apply = _init_apply, \ + .flags = _flags, \ } -TPS_PDATA_INIT(vio, 600, 2100, 0, 0, 0, 0, -1, 0, 0); -TPS_PDATA_INIT(smps1, 600, 2100, 0, 0, 0, 0, -1, 0, 0); -TPS_PDATA_INIT(smps2, 600, 2100, 0, 0, 0, 0, -1, 0, 0); -TPS_PDATA_INIT(smps3, 600, 2100, 0, 0, 0, 0, -1, 0, 0); -TPS_PDATA_INIT(smps4, 600, 2100, 0, 0, 0, 0, -1, 0, 0); - -TPS_PDATA_INIT(ldo1, 1000, 3300, tps80031_rails(VIO), 0, 0, 0, -1, 0, 0); -TPS_PDATA_INIT(ldo2, 1000, 3300, 0, 0, 0, 0, -1, 0, 0); -TPS_PDATA_INIT(ldo3, 1000, 3300, tps80031_rails(VIO), 0, 0, 0, -1, 0, 0); -TPS_PDATA_INIT(ldo4, 1000, 3300, 0, 0, 0, 0, -1, 0, 0); -TPS_PDATA_INIT(ldo5, 1000, 3300, 0, 0, 0, 0, -1, 0, 0); -TPS_PDATA_INIT(ldo6, 1000, 3300, 0, 0, 0, 0, -1, 0, 0); -TPS_PDATA_INIT(ldo7, 1000, 3300, tps80031_rails(VIO), 0, 0, 0, -1, 0, 0); -TPS_PDATA_INIT(ldoln, 1000, 3300, tps80031_rails(SMPS3), 0, 0, 0, -1, 0, 0); -TPS_PDATA_INIT(ldousb, 1000, 3300, 0, 0, 0, 0, -1, 0, 0); -TPS_PDATA_INIT(vana, 1000, 3300, 0, 0, 0, 0, -1, 0, 0); +TPS_PDATA_INIT(vio, 600, 2100, 0, 0, 0, 0, -1, 0, 0, 0); +TPS_PDATA_INIT(smps1, 600, 2100, 0, 0, 0, 0, -1, 0, 0, 0); +TPS_PDATA_INIT(smps2, 600, 2100, 0, 0, 0, 0, -1, 0, 0, 0); +TPS_PDATA_INIT(smps3, 600, 2100, 0, 0, 0, 0, -1, 0, 0, 0); +TPS_PDATA_INIT(smps4, 600, 2100, 0, 0, 0, 0, -1, 0, 0, 0); + +TPS_PDATA_INIT(ldo1, 1000, 3300, tps80031_rails(VIO), 0, 0, 0, -1, 0, 0, 0); +TPS_PDATA_INIT(ldo2, 1000, 3300, 0, 0, 0, 0, -1, 0, 0, 0); +TPS_PDATA_INIT(ldo3, 1000, 3300, tps80031_rails(VIO), 0, 0, 0, -1, 0, 0, 0); +TPS_PDATA_INIT(ldo4, 1000, 3300, 0, 0, 0, 0, -1, 0, 0, 0); +TPS_PDATA_INIT(ldo5, 1000, 3300, 0, 0, 0, 0, -1, 0, 0, 0); +TPS_PDATA_INIT(ldo6, 1000, 3300, 0, 0, 0, 0, -1, 0, 0, 0); +TPS_PDATA_INIT(ldo7, 1000, 3300, tps80031_rails(VIO), 0, 0, 0, -1, 0, 0, 0); +TPS_PDATA_INIT(ldoln, 1000, 3300, tps80031_rails(SMPS3), 0, 0, 0, -1, 0, 0, 0); +TPS_PDATA_INIT(ldousb, 1000, 3300, 0, 0, 0, 0, -1, 0, 0, USBLDO_INPUT_VSYS); +TPS_PDATA_INIT(vana, 1000, 3300, 0, 0, 0, 0, -1, 0, 0, 0); +TPS_PDATA_INIT(vbus, 0, 5000, 0, 0, 0, 0, -1, 0, 0, VBUS_SW_ONLY); static struct tps80031_rtc_platform_data rtc_data = { .irq = TPS80031_IRQ_BASE + TPS80031_INT_RTC_ALARM, @@ -216,6 +222,7 @@ static struct tps80031_subdev_info tps80031_devs[] = { TPS_REG(LDOLN, ldoln), TPS_REG(LDOUSB, ldousb), TPS_REG(VANA, vana), + TPS_REG(VBUS, vbus), TPS_RTC(), }; |