From ac8ed55c06c291bf5ef80eeca3689457ac9e1643 Mon Sep 17 00:00:00 2001
From: Imran Ahmad <imrahm@codeaurora.org>
Date: Tue, 29 Sep 2020 18:18:39 +0530
Subject: [PATCH] power: smb5: Fix LPD flag for PMI632

Currently,LPD flag can be set either using DT property or
by default initialization based on PMIC subtype.
However, the DT property value for LPD support overrides
the default initialization.
Fix this by taking a logical OR between the two control
methods.

Change-Id: Ic99980691c59ab8d1f77e0300abb232787597f84
Signed-off-by: Imran Ahmad <imrahm@codeaurora.org>
---
 drivers/power/supply/qcom/qpnp-smb5.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/power/supply/qcom/qpnp-smb5.c b/drivers/power/supply/qcom/qpnp-smb5.c
index 8b0f21fe26cfb..ad2e58ef791e7 100644
--- a/drivers/power/supply/qcom/qpnp-smb5.c
+++ b/drivers/power/supply/qcom/qpnp-smb5.c
@@ -465,7 +465,8 @@ static int smb5_parse_dt_misc(struct smb5 *chip, struct device_node *node)
 	chg->pd_not_supported = chg->pd_not_supported ||
 			of_property_read_bool(node, "qcom,usb-pd-disable");
 
-	chg->lpd_disabled = of_property_read_bool(node, "qcom,lpd-disable");
+	chg->lpd_disabled = chg->lpd_disabled ||
+			of_property_read_bool(node, "qcom,lpd-disable");
 
 	rc = of_property_read_u32(node, "qcom,wd-bark-time-secs",
 					&chip->dt.wd_bark_time);
-- 
GitLab