summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbhijeet Dharmapurikar <adharmap@codeaurora.org>2016-12-05 17:52:11 -0800
committerAbhijeet Dharmapurikar <adharmap@codeaurora.org>2016-12-06 16:07:14 -0800
commit8e4af976fac76600a8c9560333a46b799d307e39 (patch)
treee54d8c23def58d22e510338cefa52c8adf8bcc6e
parent9febdfdde008c8d7875b5186a4a37cb515cb924d (diff)
smb-lib: revert the boost back workaround for dc path
It is expected to get 3 switcher-power-ok interrupts in a span of 1 second for Wipower. This causes the boost back workaround to suspend dc path. The boost back problem was never seen on Wipower. Revert the boost back workaround for Wipower until a proper fix is in place. Change-Id: I81b4a3184a709a5328b04c389b0e5277d65a675d Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
-rw-r--r--drivers/power/qcom-charger/smb-lib.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/power/qcom-charger/smb-lib.c b/drivers/power/qcom-charger/smb-lib.c
index 3403474565be..b4344ea7e47a 100644
--- a/drivers/power/qcom-charger/smb-lib.c
+++ b/drivers/power/qcom-charger/smb-lib.c
@@ -2453,12 +2453,9 @@ irqreturn_t smblib_handle_usb_plugin(int irq, void *data)
rc);
}
} else {
- if (chg->wa_flags & BOOST_BACK_WA) {
+ if (chg->wa_flags & BOOST_BACK_WA)
vote(chg->usb_suspend_votable,
BOOST_BACK_VOTER, false, 0);
- vote(chg->dc_suspend_votable,
- BOOST_BACK_VOTER, false, 0);
- }
if (chg->dpdm_reg && regulator_is_enabled(chg->dpdm_reg)) {
smblib_dbg(chg, PR_MISC, "disabling DPDM regulator\n");
@@ -2942,14 +2939,12 @@ irqreturn_t smblib_handle_switcher_power_ok(int irq, void *data)
get_effective_result(chg->usb_suspend_votable))
return IRQ_HANDLED;
- if ((stat & USE_DCIN_BIT) &&
- get_effective_result(chg->dc_suspend_votable))
+ if (stat & USE_DCIN_BIT)
return IRQ_HANDLED;
if (is_storming(&irq_data->storm_data)) {
- smblib_dbg(chg, PR_MISC, "reverse boost detected; suspending input\n");
+ smblib_err(chg, "Reverse boost detected: suspending input\n");
vote(chg->usb_suspend_votable, BOOST_BACK_VOTER, true, 0);
- vote(chg->dc_suspend_votable, BOOST_BACK_VOTER, true, 0);
}
return IRQ_HANDLED;