From 35120df1da2ab9615fd37f178e19b98d6ce47c7a Mon Sep 17 00:00:00 2001
From: mahj8 <mahj8@motorola.com>
Date: Thu, 17 Feb 2022 11:40:53 +0800
Subject: [PATCH] charging: ignore setting qc icl when pd active

when user insert PD charger which also supply qc protocol,
QC ICL setting will overlay PD ICL setting. So ignore it.

Change-Id: Ic18b8a17e55c6a6131e77d96b584a245ca793496
Signed-off-by: mahj8 <mahj8@motorola.com>
Reviewed-on: https://gerrit.mot.com/2192867
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
---
 drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.c b/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.c
index 9fbc11c3bf08..81a3ae49ff34 100644
--- a/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.c
+++ b/drivers/power/mmi_discrete_charger/mmi_discrete_charger_core.c
@@ -1804,6 +1804,9 @@ static void mmi_handle_hvdcp_check_timeout(struct mmi_discrete_charger *chg,
 {
 	u32 hvdcp_ua = 0;
 
+	if (chg->pd_active)
+		return;
+
 	if (hvdcp_done) {
 		hvdcp_ua = (chg->real_charger_type ==
 				POWER_SUPPLY_TYPE_USB_HVDCP) ?