From c9ae525d939112cbd6f2783a4ba983b3c35d5d72 Mon Sep 17 00:00:00 2001
From: Ted Lin <tedlin@android.com>
Date: Thu, 8 Mar 2018 14:20:33 +0800
Subject: [PATCH] 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 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/power/qpnp-smbcharger.c b/drivers/power/qpnp-smbcharger.c
index 2257cf6e1c86..fa49039b8c9f 100644
--- a/drivers/power/qpnp-smbcharger.c
+++ b/drivers/power/qpnp-smbcharger.c
@@ -5501,6 +5501,11 @@ static void smbchg_sink_current_change_worker(struct work_struct *work)
 		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;
-- 
GitLab