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-14 08:36:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

mmi_charger: modify enum redefined

Browse source 
change mmi_charger enum redefined
It has been redefined in kernel:
kernel/msm-4.19/include/linux/power_supply.h

Change-Id: I10d158cf5c79d2a17903e92e9e5d5a353178f1d6
Signed-off-by: huaqin86 <huaqin86@motorola.com>
Reviewed-on: https://gerrit.mot.com/2110586
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Yonghua Yan <yanyh2@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
huaqin86 2021-11-09 11:32:32 +08:00
commit 6cd6569853
1 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -52,12 +52,12 @@ module_param(suspend_wakeups, int, 0644);
static struct mmi_charger_chip *this_chip = NULL;
enum {
POWER_SUPPLY_CHARGE_RATE_NONE = 0,
POWER_SUPPLY_CHARGE_RATE_NORMAL,
POWER_SUPPLY_CHARGE_RATE_WEAK,
POWER_SUPPLY_CHARGE_RATE_TURBO,
POWER_SUPPLY_CHARGE_RATE_TURBO_30W,
POWER_SUPPLY_CHARGE_RATE_HYPER,
MMI_POWER_SUPPLY_CHARGE_RATE_NONE = 0,
MMI_POWER_SUPPLY_CHARGE_RATE_NORMAL,
MMI_POWER_SUPPLY_CHARGE_RATE_WEAK,
MMI_POWER_SUPPLY_CHARGE_RATE_TURBO,
MMI_POWER_SUPPLY_CHARGE_RATE_TURBO_30W,
MMI_POWER_SUPPLY_CHARGE_RATE_HYPER,
};
enum {
@ -1630,17 +1630,17 @@ int mmi_get_battery_charger_rate(struct mmi_charger *charger)
info = &charger->chg_info;
if (!info->chrg_present)
rate = POWER_SUPPLY_CHARGE_RATE_NONE;
rate = MMI_POWER_SUPPLY_CHARGE_RATE_NONE;
else if (info->chrg_pmax_mw < WEAK_CHRG_THRSH_MW)
rate = POWER_SUPPLY_CHARGE_RATE_WEAK;
rate = MMI_POWER_SUPPLY_CHARGE_RATE_WEAK;
else if (info->chrg_pmax_mw < TURBO_CHRG_THRSH_MW)
rate = POWER_SUPPLY_CHARGE_RATE_NORMAL;
rate = MMI_POWER_SUPPLY_CHARGE_RATE_NORMAL;
else if (info->chrg_pmax_mw < TURBO_CHRG_30W_THRSH_MW)
rate = POWER_SUPPLY_CHARGE_RATE_TURBO;
rate = MMI_POWER_SUPPLY_CHARGE_RATE_TURBO;
else if (info->chrg_pmax_mw < HYPER_CHRG_THRSH_MW)
rate = POWER_SUPPLY_CHARGE_RATE_TURBO_30W;
rate = MMI_POWER_SUPPLY_CHARGE_RATE_TURBO_30W;
else
rate = POWER_SUPPLY_CHARGE_RATE_HYPER;
rate = MMI_POWER_SUPPLY_CHARGE_RATE_HYPER;
return rate;
}
@ -1801,8 +1801,8 @@ static void mmi_update_battery_status(struct mmi_charger_chip *chip)
bool mmi_changed = false;
int batt_temp;
int batt_health = POWER_SUPPLY_HEALTH_UNKNOWN;
int charger_rate = POWER_SUPPLY_CHARGE_RATE_NONE;
int max_charger_rate = POWER_SUPPLY_CHARGE_RATE_NONE;
int charger_rate = MMI_POWER_SUPPLY_CHARGE_RATE_NONE;
int max_charger_rate = MMI_POWER_SUPPLY_CHARGE_RATE_NONE;
struct mmi_charger *charger = NULL;
struct mmi_battery_pack *battery = NULL;
struct mmi_battery_info *batt_info = NULL;
@ -1818,7 +1818,7 @@ static void mmi_update_battery_status(struct mmi_charger_chip *chip)
if (battery->pending == battery->reference) {
/* init for going through all chargers */
battery->status = POWER_SUPPLY_STATUS_DISCHARGING;
battery->charger_rate = POWER_SUPPLY_CHARGE_RATE_NONE;
battery->charger_rate = MMI_POWER_SUPPLY_CHARGE_RATE_NONE;
/* update only at the first charger */
battery->health = mmi_get_battery_health(charger);
@ -2009,7 +2009,7 @@ static void mmi_charger_heartbeat_work(struct work_struct *work)
if (chip->factory_mode ||
(chip->factory_version && chip->enable_factory_poweroff)) {
if (chip->max_charger_rate > POWER_SUPPLY_CHARGE_RATE_NONE) {
if (chip->max_charger_rate > MMI_POWER_SUPPLY_CHARGE_RATE_NONE) {
mmi_dbg(chip, "Factory Kill Armed\n");
chip->factory_kill_armed = true;
} else if (chip->factory_kill_armed && !factory_kill_disable) {
@ -2024,18 +2024,18 @@ static void mmi_charger_heartbeat_work(struct work_struct *work)
if (chip->factory_mode)
hb_resch_time = HEARTBEAT_FACTORY_MS;
else if (chip->max_charger_rate != POWER_SUPPLY_CHARGE_RATE_NONE)
else if (chip->max_charger_rate != MMI_POWER_SUPPLY_CHARGE_RATE_NONE)
hb_resch_time = chip->heartbeat_interval;
else
hb_resch_time = HEARTBEAT_DISCHARGE_MS;
schedule_delayed_work(&chip->heartbeat_work,
msecs_to_jiffies(hb_resch_time));
if (suspend_wakeups ||
chip->max_charger_rate != POWER_SUPPLY_CHARGE_RATE_NONE)
chip->max_charger_rate != MMI_POWER_SUPPLY_CHARGE_RATE_NONE)
alarm_start_relative(&chip->heartbeat_alarm,
ns_to_ktime(HEARTBEAT_WAKEUP_INTRVAL_NS));
if (chip->max_charger_rate == POWER_SUPPLY_CHARGE_RATE_NONE)
if (chip->max_charger_rate == MMI_POWER_SUPPLY_CHARGE_RATE_NONE)
pm_relax(chip->dev);
PM_RELAX(chip->mmi_hb_wake_source);
@ -2392,7 +2392,7 @@ static int mmi_charger_reboot(struct notifier_block *nb,
factory_kill_disable = true;
chip->force_charger_disabled = true;
schedule_delayed_work(&chip->heartbeat_work, msecs_to_jiffies(0));
while (chip->max_charger_rate != POWER_SUPPLY_CHARGE_RATE_NONE) {
while (chip->max_charger_rate != MMI_POWER_SUPPLY_CHARGE_RATE_NONE) {
mmi_info(chip, "Wait for charger removal\n");
msleep(100);
}