From 35f4f99ccbc1ccf3a1f1157a5f2f14d6a7d1848f Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Wed, 3 May 2017 17:15:32 -0700
Subject: [PATCH] power: supply: cpcap-charger: Keep trickle charger bits
disabled
Android does not seem to set the trickle charger bits, and these
seem to be only used by the bootloader when bringing up a
completely discharged battery. So let's keep the trickle charging
bits disabled and avoid misconfiguring the hardware.
Fixes: 0c9888e3c192 ("power: supply: cpcap-charger: Add minimal
CPCAP PMIC battery charger")
Cc: Marcel Partap <mpartap@gmx.net>
Cc: Michael Scott <michael.scott@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
---
drivers/power/supply/cpcap-charger.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/power/supply/cpcap-charger.c b/drivers/power/supply/cpcap-charger.c
index 378fbdaba85ba..26a2dc7ac9a27 100644
--- a/drivers/power/supply/cpcap-charger.c
+++ b/drivers/power/supply/cpcap-charger.c
@@ -434,8 +434,7 @@ static void cpcap_usb_detect(struct work_struct *work)
error = cpcap_charger_set_state(ddata,
CPCAP_REG_CRM_VCHRG_4V35,
- max_current,
- CPCAP_REG_CRM_TR_0A72);
+ max_current, 0);
if (error)
goto out_err;
} else {
--
GitLab