A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-25 06:03:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

mmi_charger: combine flip & main battery charge counter

Browse source 
combine flip & main battery charge counter
for maven.

Change-Id: Id140068a200a419a4aaa23255a90f75c4346073d
Reviewed-on: https://gerrit.mot.com/2293045
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Yonghua Yan <yanyh2@motorola.com>
Reviewed-by: Jianqi Yang <yangj@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Gong Shicheng 2022-06-08 11:51:28 +08:00 • committed by Shicheng Gong
commit 0b97a147ed
2 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

26
drivers/power/mmi_charger/mmi_charger.c
View file

@ -209,6 +209,7 @@ struct mmi_charger_chip {
int combo_status;
int combo_health;
int combo_temp;
int combo_charge_counter;
int charge_full;
int charge_full_design;
int init_cycles;
@ -1862,6 +1863,18 @@ static int mmi_combine_battery_current(struct mmi_charger_chip *chip)
return current_ma;
}
static int mmi_combine_charge_counter(struct mmi_charger_chip *chip)
{
int counter = 0;
struct mmi_battery_pack *battery = NULL;
list_for_each_entry(battery, &chip->battery_list, list) {
counter += battery->info->batt_chg_counter;
}
return counter;
}
static int mmi_combine_battery_voltage(struct mmi_charger_chip *chip)
{
int voltage_mv = 0;
@ -1887,6 +1900,7 @@ static void mmi_update_battery_status(struct mmi_charger_chip *chip)
int cycles;
int voltage_mv;
int current_ma;
int charge_counter;
bool mmi_changed = false;
int batt_temp;
int batt_health = POWER_SUPPLY_HEALTH_UNKNOWN;
@ -1972,6 +1986,7 @@ static void mmi_update_battery_status(struct mmi_charger_chip *chip)
age = mmi_combine_battery_age(chip);
voltage_mv = mmi_combine_battery_voltage(chip);
current_ma = mmi_combine_battery_current(chip);
charge_counter = mmi_combine_charge_counter(chip);
if (soc >= 0 && chip->combo_soc != soc) {
mmi_changed = true;
chip->combo_soc = soc;
@ -1995,6 +2010,9 @@ static void mmi_update_battery_status(struct mmi_charger_chip *chip)
if (chip->combo_current_ma != current_ma) {
chip->combo_current_ma = current_ma;
}
if (chip->combo_charge_counter != charge_counter) {
chip->combo_charge_counter = charge_counter;
}
if (chip->max_charger_rate != max_charger_rate) {
mmi_changed = true;
chip->max_charger_rate = max_charger_rate;
@ -2048,7 +2066,7 @@ static void mmi_update_battery_status(struct mmi_charger_chip *chip)
power_supply_changed(chip->mmi_psy);
mmi_info(chip, "Combo status: soc:%d, status:%d, temp:%d,"
" health:%d, age:%d, cycles:%d, voltage:%d, current:%d,"
" rate:%s, lpd:%d, vbus:%d\n",
" counter:%d, rate:%s, lpd:%d, vbus:%d\n",
chip->combo_soc,
chip->combo_status,
chip->combo_temp,
@ -2057,6 +2075,7 @@ static void mmi_update_battery_status(struct mmi_charger_chip *chip)
chip->combo_cycles,
chip->combo_voltage_mv,
chip->combo_current_ma,
chip->combo_charge_counter,
charge_rate[chip->max_charger_rate],
chip->lpd_present,
chip->vbus_present);
@ -2535,6 +2554,7 @@ static enum power_supply_property mmi_props[] = {
POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
POWER_SUPPLY_PROP_VOLTAGE_NOW,
POWER_SUPPLY_PROP_CURRENT_NOW,
POWER_SUPPLY_PROP_CHARGE_COUNTER,
};
static int mmi_get_prop(struct power_supply *psy,
@ -2572,6 +2592,9 @@ static int mmi_get_prop(struct power_supply *psy,
case POWER_SUPPLY_PROP_CURRENT_NOW:
val->intval = chip->combo_current_ma * 1000;
break;
case POWER_SUPPLY_PROP_CHARGE_COUNTER:
val->intval = chip->combo_charge_counter;
break;
default:
val->intval = -EINVAL;
break;
@ -2731,6 +2754,7 @@ static int mmi_charger_probe(struct platform_device *pdev)
chip->combo_current_ma = 0;
chip->combo_cycles = 0;
chip->combo_soc = 100;
chip->combo_charge_counter = 0;
chip->charge_full = 0;
chip->charge_full_design = 0;
chip->init_cycles = 0;

1
drivers/power/mmi_charger/mmi_charger.h
View file

@ -66,6 +66,7 @@ struct mmi_battery_info {
int batt_status;
int batt_full_uah;
int batt_design_uah;
int batt_chg_counter;
char batt_sn[MMI_BATT_SN_LEN];
};