From: Tony Lindgren <tony@atomide.com>
Date: Thu, 4 May 2017 00:15:32 +0000 (-0700)
Subject: power: supply: cpcap-charger: Keep trickle charger bits disabled
X-Git-Tag: v4.12-rc1~7^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=35f4f99ccbc1ccf3a1f1157a5f2f14d6a7d1848f;p=karo-tx-linux.git

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>
---

diff --git a/drivers/power/supply/cpcap-charger.c b/drivers/power/supply/cpcap-charger.c
index 378fbdaba85b..26a2dc7ac9a2 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 {