diff options
| author | ben_chao <ben_chao@asus.com> | 2016-01-27 20:12:00 +0800 |
|---|---|---|
| committer | Eric1 Lin <Eric1_Lin@asus.com> | 2016-01-28 22:03:54 +0800 |
| commit | 3d2fa521411917b5a1683fec42ad2a8e50aee79f (patch) | |
| tree | 65942798ea41d772b2718c4c5b3ec7985d2f7ba8 | |
| parent | 640bf6b392a5b54b1b2a22ee6681a7fa68ff520f (diff) | |
Common: charger: fixed the battery capacity issueandroid-wear-6.0.1_r0.12android-wear-6.0.1_r0.10
a. modify chg_failed IRQ to report full charge
b. Fix battery level drop from 100% to 98% to meet 100% rule
Bug: 26842493
Bug: 26842787
Change-Id: Id7f3e39c0cac90e604852fa94c61a57645e8986b
Reviewed-on: http://mcrd1-22-pc.corpnet.asus/code-review/master/211918
Reviewed-by: Ben_Chao <ben_chao@asus.com>
Tested-by: Ben_Chao <ben_chao@asus.com>
Reviewed-by: Eric1 Lin <Eric1_Lin@asus.com>
| -rw-r--r-- | drivers/power/qpnp-bms.c | 2 | ||||
| -rw-r--r-- | drivers/power/qpnp-charger.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/qpnp-bms.c b/drivers/power/qpnp-bms.c index 36026cead332..29e69e55dc73 100644 --- a/drivers/power/qpnp-bms.c +++ b/drivers/power/qpnp-bms.c @@ -2095,7 +2095,7 @@ static int report_cc_based_soc(struct qpnp_bms_chip *chip) backup_soc_and_iavg(chip, batt_temp, chip->last_soc); pr_debug("Reported SOC = %d\n", chip->last_soc); mutex_unlock(&chip->last_soc_mutex); - if ((chip->last_soc >= 99) && (chip->calculated_soc >= 98) && (time_since_last_change_sec <= 60) + if ((chip->calculated_soc >= 98) && (time_since_last_change_sec <= 60) && (get_battery_status(chip) == POWER_SUPPLY_STATUS_DISCHARGING) && charge_full == true) return soc_temp; else { diff --git a/drivers/power/qpnp-charger.c b/drivers/power/qpnp-charger.c index 6613305ef63d..6f7990d11d79 100644 --- a/drivers/power/qpnp-charger.c +++ b/drivers/power/qpnp-charger.c @@ -2143,7 +2143,7 @@ qpnp_chg_chgr_chg_failed_irq_handler(int irq, void *_chip) u8 chg_led = 0; //ASUS_BSP + printk("chg_failed triggered\n"); - + chip->chg_done = true; qpnp_chg_write(chip, &chg_led, 0x104D, 1);//ASUS_BSP + rc = qpnp_chg_masked_write(chip, |