From 3041e580e809545004876fbc8f723f5ebf3729e6 Mon Sep 17 00:00:00 2001 From: Subbaraman Narayanamurthy Date: Mon, 17 Aug 2020 10:10:54 -0700 Subject: [PATCH] power: supply: qti_battery_charger: allow setting ICL for USB_PD charger USB driver can request for an ICL override (e.g. 2 mA when the host enters suspend) when the device is connected to the host to a SDP or a port that supports USB_PD. With USB_PD, if PDO 1 has bit 28 set to 1, it advertises that suspend is supported. Hence allow setting ICL for USB_PD charger as well. Change-Id: I5a9eea05c58a7c8140c2910be97788f7f63efb05 Signed-off-by: Subbaraman Narayanamurthy --- drivers/power/supply/qti_battery_charger.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/power/supply/qti_battery_charger.c b/drivers/power/supply/qti_battery_charger.c index e32940879993..a2a6f2f34f83 100644 --- a/drivers/power/supply/qti_battery_charger.c +++ b/drivers/power/supply/qti_battery_charger.c @@ -814,8 +814,9 @@ static int usb_psy_set_icl(struct battery_chg_dev *bcdev, u32 prop_id, int val) if (rc < 0) return rc; - /* Allow this only for SDP and not for other charger types */ - if (pst->prop[USB_ADAP_TYPE] != POWER_SUPPLY_USB_TYPE_SDP) + /* Allow this only for SDP or USB_PD and not for other charger types */ + if (pst->prop[USB_ADAP_TYPE] != POWER_SUPPLY_USB_TYPE_SDP && + pst->prop[USB_ADAP_TYPE] != POWER_SUPPLY_USB_TYPE_PD) return -EINVAL; /*