arm: tegra: power detect update
Bitan Biswas [Mon, 17 Sep 2012 17:45:09 +0000 (22:45 +0530)]
- 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

arch/arm/mach-tegra/board-dalmore-power.c
arch/arm/mach-tegra/board-pluto-power.c
arch/arm/mach-tegra/powerdetect.c

index b9ccd8f..22a765a 100644 (file)
@@ -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),
index 2036233..789dc32 100644 (file)
@@ -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),
 
 };
index 886ffce..66f65ab 100644 (file)
@@ -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
 };