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 378fbdaba85ba6548ed7b3564347fac6bc514db2..26a2dc7ac9a2777643ec2b3abda2e19af0b7ea50 100644 (file)
--- 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 {