From 3974bb7b3fdc2c7732dd2ed32087996b10ad7181 Mon Sep 17 00:00:00 2001 From: mahj8 Date: Fri, 26 Nov 2021 17:34:24 +0800 Subject: [PATCH] charging: remove FULL status in charging ic driver As moto charging FULL status judge in SW policy, so we must remove FULL status in charging ic driver. Change-Id: I881b1464bdeb9e9c6599dee15d33189c6b4d1594 Signed-off-by: mahj8 Reviewed-on: https://gerrit.mot.com/2128758 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- drivers/power/bq2589x_chg_mmi/bq2589x_charger.c | 4 +--- drivers/power/sgm4154x_chg_mmi/sgm4154x_charger.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/power/bq2589x_chg_mmi/bq2589x_charger.c b/drivers/power/bq2589x_chg_mmi/bq2589x_charger.c index 4e3d45df0c60..2c7cf6c57742 100644 --- a/drivers/power/bq2589x_chg_mmi/bq2589x_charger.c +++ b/drivers/power/bq2589x_chg_mmi/bq2589x_charger.c @@ -1028,12 +1028,10 @@ static int bq2589x_power_supply_get_property(struct power_supply *psy, chrg_status = bq2589x_get_charging_status(bq); if (!state.online) val->intval = POWER_SUPPLY_STATUS_DISCHARGING; - else if (chrg_status == STATUS_NOT_CHARGING) + else if (chrg_status == STATUS_NOT_CHARGING || chrg_status == STATUS_TERMINATION_DONE) val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING; else if (chrg_status == STATUS_PRE_CHARGING || chrg_status == STATUS_FAST_CHARGING) val->intval = POWER_SUPPLY_STATUS_CHARGING; - else if (chrg_status == STATUS_TERMINATION_DONE) - val->intval = POWER_SUPPLY_STATUS_FULL; else val->intval = POWER_SUPPLY_STATUS_UNKNOWN; break; diff --git a/drivers/power/sgm4154x_chg_mmi/sgm4154x_charger.c b/drivers/power/sgm4154x_chg_mmi/sgm4154x_charger.c index ed281476b7c0..016de370fd85 100644 --- a/drivers/power/sgm4154x_chg_mmi/sgm4154x_charger.c +++ b/drivers/power/sgm4154x_chg_mmi/sgm4154x_charger.c @@ -1060,10 +1060,8 @@ static int sgm4154x_charger_get_property(struct power_supply *psy, chrg_status = sgm4154x_get_charging_status(sgm); if (!state.chrg_type || (state.chrg_type == SGM4154x_OTG_MODE)) val->intval = POWER_SUPPLY_STATUS_DISCHARGING; - else if (!chrg_status) + else if (!chrg_status || (chrg_status == SGM4154x_TERM_CHRG)) val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING; - else if (chrg_status == SGM4154x_TERM_CHRG) - val->intval = POWER_SUPPLY_STATUS_FULL; else val->intval = POWER_SUPPLY_STATUS_CHARGING; break;