diff options
| author | Bitan Biswas <bbiswas@nvidia.com> | 2012-09-17 23:15:09 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 12:35:34 -0700 |
| commit | 3663f3eb22575573904ad42e755a44f8b32ee7b9 (patch) | |
| tree | 55f12ef408439fe623cd868ca9c8ba090de57bed | |
| parent | e27f0d53e2eafc35b3ba8aae96fd1c765b638702 (diff) | |
arm: tegra: power detect update
- Power detect hv regulator entry added for dalmore and pluto
- mem_comp no iopower entry removed from T114 power detect table as
software cannot turn these off
Reviewed-on: http://git-master/r/133285
(cherry picked from commit bab3fda7e504e302db5cfbddc131b48c84a3c4f8)
Change-Id: Ifea4329cf4035d67b1f77897659abfe48b948678
Signed-off-by: Bitan Biswas <bbiswas@nvidia.com>
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/143065
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Rebase-Id: R8d60adba573dda42c2e71c04e4d5b93996d49057
| -rw-r--r-- | arch/arm/mach-tegra/board-dalmore-power.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-pluto-power.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/powerdetect.c | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-dalmore-power.c b/arch/arm/mach-tegra/board-dalmore-power.c index b9ccd8f0cb7d..22a765afe613 100644 --- a/arch/arm/mach-tegra/board-dalmore-power.c +++ b/arch/arm/mach-tegra/board-dalmore-power.c @@ -60,6 +60,7 @@ static struct regulator_consumer_supply tps65090_dcdc1_supply[] = { static struct regulator_consumer_supply tps65090_dcdc2_supply[] = { REGULATOR_SUPPLY("vdd_sys_3v3", NULL), REGULATOR_SUPPLY("vddio_hv", "tegradc.1"), + REGULATOR_SUPPLY("pwrdet_hv", NULL), REGULATOR_SUPPLY("vdd_sys_ds_3v3", NULL), REGULATOR_SUPPLY("vdd_sys_nfc_3v3", NULL), REGULATOR_SUPPLY("vdd_hv_nfc_3v3", NULL), diff --git a/arch/arm/mach-tegra/board-pluto-power.c b/arch/arm/mach-tegra/board-pluto-power.c index 203623345c29..789dc32a8ea8 100644 --- a/arch/arm/mach-tegra/board-pluto-power.c +++ b/arch/arm/mach-tegra/board-pluto-power.c @@ -185,6 +185,7 @@ static struct regulator_consumer_supply palmas_ldousb_supply[] = { REGULATOR_SUPPLY("hvdd_usb", "tegra-ehci.2"), REGULATOR_SUPPLY("avdd_hdmi", "tegradc.1"), REGULATOR_SUPPLY("vddio_hv", "tegradc.1"), + REGULATOR_SUPPLY("pwrdet_hv", NULL), REGULATOR_SUPPLY("vdd_dtv_3v3", NULL), }; diff --git a/arch/arm/mach-tegra/powerdetect.c b/arch/arm/mach-tegra/powerdetect.c index 886ffcecb2db..66f65abd8b88 100644 --- a/arch/arm/mach-tegra/powerdetect.c +++ b/arch/arm/mach-tegra/powerdetect.c @@ -104,7 +104,6 @@ static struct pwr_detect_cell pwr_detect_cells[] = { POWER_CELL("pwrdet_sdmmc4", 0, (0x1 << 14), 0xFFFFFFFF), #ifdef CONFIG_ARCH_TEGRA_11x_SOC POWER_CELL("pwrdet_hv", (0x1 << 15), (0x1 << 15), 0xFFFFFFFF), - POWER_CELL("pwrdet_mem_comp", 0, (0x1 << 16), 0xFFFFFFFF), #endif #endif }; |