diff options
| author | Fenglin Wu <fenglinw@codeaurora.org> | 2016-11-22 13:16:19 +0800 |
|---|---|---|
| committer | Fenglin Wu <fenglinw@codeaurora.org> | 2016-12-16 14:05:22 +0800 |
| commit | c665d840c7cafc04a0c42b6d14f71fcf65526973 (patch) | |
| tree | 3e0997f1186086066b69073e6e779b327fa05756 | |
| parent | 2a16792344fae47d8c1e4b0610b7473a29413492 (diff) | |
qcom-charger: Add ship mode support
Add POWER_SUPPLY_PROP_SET_SHIP_MODE property to set ship mode. In
ship-mode, the bat-fet is opened and battery is completely disconnected
from the system.
CRs-Fixed: 1092969
Change-Id: Idc50342df8600f482a16f9a2f3a97773c3487eb8
Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
| -rw-r--r-- | drivers/power/qcom-charger/qpnp-smb2.c | 11 | ||||
| -rw-r--r-- | drivers/power/qcom-charger/smb-lib.c | 19 | ||||
| -rw-r--r-- | drivers/power/qcom-charger/smb-lib.h | 3 |
3 files changed, 32 insertions, 1 deletions
diff --git a/drivers/power/qcom-charger/qpnp-smb2.c b/drivers/power/qcom-charger/qpnp-smb2.c index e73ed2f1d288..a300c27ae082 100644 --- a/drivers/power/qcom-charger/qpnp-smb2.c +++ b/drivers/power/qcom-charger/qpnp-smb2.c @@ -666,6 +666,7 @@ static enum power_supply_property smb2_batt_props[] = { POWER_SUPPLY_PROP_CHARGE_DONE, POWER_SUPPLY_PROP_PARALLEL_DISABLE, POWER_SUPPLY_PROP_PARALLEL_PERCENT, + POWER_SUPPLY_PROP_SET_SHIP_MODE, }; static int smb2_batt_get_prop(struct power_supply *psy, @@ -741,6 +742,10 @@ static int smb2_batt_get_prop(struct power_supply *psy, case POWER_SUPPLY_PROP_PARALLEL_PERCENT: val->intval = chg->pl.slave_pct; break; + case POWER_SUPPLY_PROP_SET_SHIP_MODE: + /* Not in ship mode as long as device is active */ + val->intval = 0; + break; default: pr_err("batt power supply prop %d not supported\n", psp); return -EINVAL; @@ -786,6 +791,12 @@ static int smb2_batt_set_prop(struct power_supply *psy, case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX: vote(chg->fcc_max_votable, DEFAULT_VOTER, true, val->intval); break; + case POWER_SUPPLY_PROP_SET_SHIP_MODE: + /* Not in ship mode as long as the device is active */ + if (!val->intval) + break; + rc = smblib_set_prop_ship_mode(chg, val); + break; default: rc = -EINVAL; } diff --git a/drivers/power/qcom-charger/smb-lib.c b/drivers/power/qcom-charger/smb-lib.c index 507704dd469a..39df2993c6b6 100644 --- a/drivers/power/qcom-charger/smb-lib.c +++ b/drivers/power/qcom-charger/smb-lib.c @@ -39,6 +39,9 @@ static bool is_secure(struct smb_charger *chg, int addr) { + + if (addr == SHIP_MODE_REG) + return true; /* assume everything above 0xA0 is secure */ return (bool)((addr & 0xFF) >= 0xA0); } @@ -2084,6 +2087,22 @@ int smblib_set_prop_pd_active(struct smb_charger *chg, return rc; } +int smblib_set_prop_ship_mode(struct smb_charger *chg, + const union power_supply_propval *val) +{ + int rc; + + smblib_dbg(chg, PR_MISC, "Set ship mode: %d!!\n", !!val->intval); + + rc = smblib_masked_write(chg, SHIP_MODE_REG, SHIP_MODE_EN_BIT, + !!val->intval ? SHIP_MODE_EN_BIT : 0); + if (rc < 0) + dev_err(chg->dev, "Couldn't %s ship mode, rc=%d\n", + !!val->intval ? "enable" : "disable", rc); + + return rc; +} + int smblib_reg_block_update(struct smb_charger *chg, struct reg_info *entry) { diff --git a/drivers/power/qcom-charger/smb-lib.h b/drivers/power/qcom-charger/smb-lib.h index b309095b04c1..4b655cc4e7b2 100644 --- a/drivers/power/qcom-charger/smb-lib.h +++ b/drivers/power/qcom-charger/smb-lib.h @@ -352,9 +352,10 @@ int smblib_set_prop_pd_active(struct smb_charger *chg, const union power_supply_propval *val); int smblib_set_prop_pd_in_hard_reset(struct smb_charger *chg, const union power_supply_propval *val); - int smblib_get_prop_slave_current_now(struct smb_charger *chg, union power_supply_propval *val); +int smblib_set_prop_ship_mode(struct smb_charger *chg, + const union power_supply_propval *val); int smblib_validate_initial_typec_legacy_status(struct smb_charger *chg); |