diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2013-01-22 19:15:35 +0530 |
|---|---|---|
| committer | Matthew Pedro <mapedro@nvidia.com> | 2013-02-01 12:19:58 -0800 |
| commit | 1ff6b9489fbc737e3e2bc7660b92cebbfaea5247 (patch) | |
| tree | 40a7ae8762ce07d35e8d8ca5fa8c4417f205f8df | |
| parent | d99083e607e17d47ff686146a470044e00c320f0 (diff) | |
ARM: tegra: cardhu: Add battery regulatortegra-l4t-r16r3-rctegra-l4t-r16-er-2013-02-13
Add battery regulator which is always-on. The rail which is
powered from battery can be added on this rail as consumer.
bug 1218527
Change-Id: I2394e1894649cd4fa736646981374681f603c832
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/#change,193052
(cherry picked from commit 4b9cabe87060bf5f252206aba5b62ea1ccb2ff83)
Reviewed-on: http://git-master/r/193777
Tested-by: Preetham Chandru <pchandru@nvidia.com>
Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu-power.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-power.c b/arch/arm/mach-tegra/board-cardhu-power.c index d69426a30c67..2ca143010165 100644 --- a/arch/arm/mach-tegra/board-cardhu-power.c +++ b/arch/arm/mach-tegra/board-cardhu-power.c @@ -709,6 +709,11 @@ static struct regulator_consumer_supply fixed_reg_en_vddio_vid_oc_supply[] = { REGULATOR_SUPPLY("vdd_hdmi_con", NULL), }; +/* Battery powered rail*/ +static struct regulator_consumer_supply fixed_reg_en_battery_supply[] = { + REGULATOR_SUPPLY("usb_vbus", "tegra-ehci.1"), +}; + /* Macro for defining fixed regulator sub device data */ #define FIXED_SUPPLY(_name) "fixed_reg_"#_name #define FIXED_REG_OD(_id, _var, _name, _in_supply, _always_on, \ @@ -828,6 +833,8 @@ FIXED_REG_OD(16, en_usb3_vbus_oc_a03, en_usb3_vbus_oc, FIXED_SUPPLY(en_5v0), 0 /* E1198/E1291 specific */ FIXED_REG_OD(17, en_vddio_vid_oc, en_vddio_vid_oc, FIXED_SUPPLY(en_5v0), 0, 0, TEGRA_GPIO_PT0, true, 0, 5000, true); +/* Always ON */ +FIXED_REG(22, en_battery, en_battery, NULL, 1, 1, -1, true, 1, 5000); /* * Creating the fixed/gpio-switch regulator device tables for different boards */ @@ -846,7 +853,8 @@ FIXED_REG_OD(17, en_vddio_vid_oc, en_vddio_vid_oc, FIXED_SUPPLY(en_5v0), 0, ADD_FIXED_REG(en_3v3_emmc), \ ADD_FIXED_REG(en_vdd_sdmmc1), \ ADD_FIXED_REG(en_3v3_pex_hvdd), \ - ADD_FIXED_REG(en_1v8_cam), + ADD_FIXED_REG(en_1v8_cam), \ + ADD_FIXED_REG(en_battery), #define COMMON_FIXED_REG_E1291_A04 \ ADD_FIXED_REG(en_5v_cp), \ @@ -861,7 +869,8 @@ FIXED_REG_OD(17, en_vddio_vid_oc, en_vddio_vid_oc, FIXED_SUPPLY(en_5v0), 0, ADD_FIXED_REG(en_3v3_emmc), \ ADD_FIXED_REG(en_vdd_sdmmc1), \ ADD_FIXED_REG(en_3v3_pex_hvdd), \ - ADD_FIXED_REG(en_1v8_cam), + ADD_FIXED_REG(en_1v8_cam), \ + ADD_FIXED_REG(en_battery), #define PM269_FIXED_REG \ ADD_FIXED_REG(en_5v_cp), \ |