summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-09-02 13:52:48 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-09-02 13:52:47 -0700
commit79317e6d4cf3929b9d6b4c25776c954294fad6fd (patch)
treea2006dc5f0158339d2742ae3efd74cc0d985bd12
parent60e9bbd784100db7db38637579aaeaf543449d44 (diff)
parent0f527600eab9ff6a09ccd3d781afe4760d8cc663 (diff)
Merge "qcom-charger: smb2: configure stat pin for parallel charging"
-rw-r--r--drivers/power/qcom-charger/qpnp-smb2.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/power/qcom-charger/qpnp-smb2.c b/drivers/power/qcom-charger/qpnp-smb2.c
index 5b951579c36b..2f439b11089f 100644
--- a/drivers/power/qcom-charger/qpnp-smb2.c
+++ b/drivers/power/qcom-charger/qpnp-smb2.c
@@ -1021,6 +1021,16 @@ static int smb2_init_hw(struct smb2 *chip)
return rc;
}
+ /* configure PMI stat output to enable and disable parallel charging */
+ rc = smblib_masked_write(chg, STAT_CFG_REG,
+ STAT_PARALLEL_CFG_BIT | STAT_SW_OVERRIDE_CFG_BIT,
+ STAT_PARALLEL_CFG_BIT);
+ if (rc < 0) {
+ dev_err(chg->dev,
+ "Couldn't configure signal for parallel rc=%d\n", rc);
+ return rc;
+ }
+
return rc;
}