summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHyongbin Kim <hyongbink@nvidia.com>2013-06-07 19:09:05 +0900
committerHarshada Kale <hkale@nvidia.com>2013-06-12 05:09:37 -0700
commit65198caacee0f8a273e80abeeadde496330e3c3f (patch)
treefa3ce74e0f12abd1c8234c66e5ba4e4332573af1
parentbddf9b43dda1b1b408ca02e99ca67ea73c7ef45e (diff)
ARM: tegra: PMU POWER off when boot with charger mode
Some charger detected as SDP but it fails enumeration because it is not PC-USB. In this case, it makes continuous reboot. power off in charger mode -> PMU reset -> VBUS poweron -> charger mode -> not detected charger-> power off in charger mode. Also, this change prevent continuous reboot in detecting charger error case. Bug 1242042 Bug 1304013 Change-Id: I086fa17ea912b745d9fa0cd21526b78a7215bb44 Signed-off-by: Hyongbin Kim <hyongbink@nvidia.com> Reviewed-on: http://git-master/r/236708 Reviewed-by: Harshada Kale <hkale@nvidia.com> Tested-by: Harshada Kale <hkale@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/board-tegratab-power.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-tegratab-power.c b/arch/arm/mach-tegra/board-tegratab-power.c
index d2ab738257a0..9c14692ec77c 100644
--- a/arch/arm/mach-tegra/board-tegratab-power.c
+++ b/arch/arm/mach-tegra/board-tegratab-power.c
@@ -747,8 +747,9 @@ int __init tegratab_regulator_init(void)
int __init tegratab_power_off_init(void)
{
- /* Use PMU reset only when battery is exist. */
- if (get_power_supply_type() == POWER_SUPPLY_TYPE_BATTERY)
+ /* Use PMU reset only when battery is exist and not charger mode. */
+ if ((get_power_supply_type() == POWER_SUPPLY_TYPE_BATTERY) &&
+ (!get_androidboot_mode_charger()))
pm_power_off = palmas_reset;
return 0;