From 38939b5e92ae99b3544f24e275746ba27cd8ba98 Mon Sep 17 00:00:00 2001 From: Ashay Jaiswal Date: Tue, 21 Mar 2017 11:15:51 +0530 Subject: [PATCH] power: smb-lib: update USBIN_V_VOTER usage The current code enables parallel charging if a high voltage charger is seen (QC or PD) or a high current charger is seen. This means that parallel charger could remain enabled when PD transitions its voltage even though it has reduced the current to 500mA. It is desirable to disable parallel charging during such voltage transition. So prepare for this change by first ensuring that only a QC charger votes for USBIN_V_VOTER. The PD charger, even while operating at higher voltages will need to depend on USBIN_I_VOTER, just like a simple DCP charger, to enable parallel charger. CRs-Fixed: 2014572 Change-Id: I03dfcff44b30b06918ebf176043873fb141f485f Signed-off-by: Ashay Jaiswal --- drivers/power/supply/qcom/smb-lib.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/power/supply/qcom/smb-lib.c b/drivers/power/supply/qcom/smb-lib.c index 51c87f963307..3d5efe874aae 100644 --- a/drivers/power/supply/qcom/smb-lib.c +++ b/drivers/power/supply/qcom/smb-lib.c @@ -2521,10 +2521,6 @@ int smblib_set_prop_usb_voltage_min(struct smb_charger *chg, return rc; } - if (chg->mode == PARALLEL_MASTER) - vote(chg->pl_enable_votable_indirect, USBIN_V_VOTER, - min_uv > MICRO_5V, 0); - chg->voltage_min_uv = min_uv; return rc; }