summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2017-05-03 17:15:32 -0700
committerSebastian Reichel <sre@kernel.org>2017-05-04 17:52:00 +0200
commit35f4f99ccbc1ccf3a1f1157a5f2f14d6a7d1848f (patch)
treeec1700c7199ac9ee85acf10363a38c6f82ea9ad9 /drivers
parent6ffa8ace7092a5414d5d387c54a66118eb90482b (diff)
downloadlinux-stable-35f4f99ccbc1ccf3a1f1157a5f2f14d6a7d1848f.tar.gz
linux-stable-35f4f99ccbc1ccf3a1f1157a5f2f14d6a7d1848f.tar.bz2
linux-stable-35f4f99ccbc1ccf3a1f1157a5f2f14d6a7d1848f.zip
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/power/supply/cpcap-charger.c3
1 files changed, 1 insertions, 2 deletions
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 {