commit ef14664305428d8307c18e25180bcda2a17e5f73
author Linux Build Service Account <lnxbuild@localhost> Mon Jun 23 12:01:35 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jun 23 12:01:35 2014 -0700
tree 08c7e1a1bb11dd2ca6ddaa69ad4e901d3c304f4f
parent b9f0f89369da44824e1236f4688084b3e7a1e64f
parent 79e08321531503297bca589e05a5c8634422b926

Merge "power: qpnp-charger: enable vtrkl comparator and disable trickle clamp"

drivers/power/qpnp-charger.c

diff --git a/drivers/power/qpnp-charger.c b/drivers/power/qpnp-charger.c
index df3493a..94d48e6 100644
--- a/drivers/power/qpnp-charger.c
+++ b/drivers/power/qpnp-charger.c
@@ -98,6 +98,8 @@
 #define CHGR_BUCK_PSTG_CTRL			0x73
 #define CHGR_BUCK_COMPARATOR_OVRIDE_1		0xEB
 #define CHGR_BUCK_COMPARATOR_OVRIDE_3		0xED
+#define CHG_OVR0				0xED
+#define CHG_TRICKLE_CLAMP			0xE3
 #define CHGR_BUCK_BCK_VBAT_REG_MODE		0x74
 #define MISC_REVISION2				0x01
 #define USB_OVP_CTL				0x42
@@ -4584,6 +4586,25 @@
 			CHGR_IBAT_TERM_CHGR,
 			0xFF, 0x08, 1);
 
+		/* HACK: trkl stuck workaround */
+
+		rc = qpnp_chg_masked_write(chip,
+			chip->chgr_base + SEC_ACCESS,
+			0xFF,
+			0xA5, 1);
+
+		rc = qpnp_chg_masked_write(chip, chip->chgr_base +
+			CHG_OVR0,
+			0xFF, 0x00, 1);
+
+		rc = qpnp_chg_masked_write(chip,
+			chip->chgr_base + SEC_ACCESS,
+			0xFF,
+			0xA5, 1);
+
+		rc = qpnp_chg_masked_write(chip, chip->chgr_base +
+			CHG_TRICKLE_CLAMP,
+			0xFF, 0x00, 1);
 		break;
 	case SMBB_BUCK_SUBTYPE:
 	case SMBBP_BUCK_SUBTYPE: