diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-04-18 22:19:29 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-18 22:19:28 -0700 |
| commit | 1342831f8a82969fedf9d83d1799b4e24e95eaaa (patch) | |
| tree | c4949c98517627004132f4067234e7ae34d6fb49 | |
| parent | 518e9d19b5533e7dd0288eb7a54de0b55d1eef63 (diff) | |
| parent | d8c64ab4211b099e25597316a956c7455af4dd56 (diff) | |
Merge "qcom: smblib: report discharging in case of input OV"
| -rw-r--r-- | drivers/power/supply/qcom/smb-lib.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/power/supply/qcom/smb-lib.c b/drivers/power/supply/qcom/smb-lib.c index 1a10b458828b..1e417e8aa22d 100644 --- a/drivers/power/supply/qcom/smb-lib.c +++ b/drivers/power/supply/qcom/smb-lib.c @@ -1535,14 +1535,16 @@ int smblib_get_prop_batt_status(struct smb_charger *chg, if (val->intval != POWER_SUPPLY_STATUS_CHARGING) return 0; - rc = smblib_read(chg, BATTERY_CHARGER_STATUS_2_REG, &stat); + rc = smblib_read(chg, BATTERY_CHARGER_STATUS_7_REG, &stat); if (rc < 0) { smblib_err(chg, "Couldn't read BATTERY_CHARGER_STATUS_2 rc=%d\n", rc); return rc; } - if (stat & (BAT_TEMP_STATUS_TOO_HOT_BIT | BAT_TEMP_STATUS_TOO_COLD_BIT)) + stat &= ENABLE_TRICKLE_BIT | ENABLE_PRE_CHARGING_BIT | + ENABLE_FAST_CHARGING_BIT | ENABLE_FULLON_MODE_BIT; + if (!stat) val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING; return 0; |