commit c9ae525d939112cbd6f2783a4ba983b3c35d5d72
author Ted Lin <tedlin@android.com> Thu Mar 08 14:20:33 2018 +0800
committer Thierry Strudel <tstrudel@google.com> Tue Mar 20 10:07:54 2018 -0700
tree 2c54896542388097445ca3557b5abb5fc20ea036
parent 514a3ff917ea7168d346cacb1751a648e2d2bdfe

power: don't consider AICL result when using PD charger

AICL is not aware of PD higher voltage contract and should not be
considered when a PD charger is used.

Bug: 72851087
Change-Id: Ic107dcd8510151b3388c9f815545952dda4d7521
Signed-off-by: Ted Lin <tedlin@android.com>
Signed-off-by: Thierry Strudel <tstrudel@google.com>

drivers/power/qpnp-smbcharger.c

diff --git a/drivers/power/qpnp-smbcharger.c b/drivers/power/qpnp-smbcharger.c
index 2257cf6..fa49039 100644
--- a/drivers/power/qpnp-smbcharger.c
+++ b/drivers/power/qpnp-smbcharger.c
@@ -5501,6 +5501,11 @@
 		return;
 	}
 
+	if (htc_battery_is_pd_detected()) {
+		pr_smb(PR_STATUS, "Not applicable for PD, skip.\n");
+		return;
+	}
+
 	pr_smb(PR_MISC, "Start.\n");
 
 	type = the_chip->usb_supply_type;