Skip to content

Commit 8e88563

Browse files
committed
Revert "power: supply: qcom_battmgr: support disabling charge control"
The charge control disabling does not work as expected and needs more time to be figured out correctly. Drop this feature for now. Reported-by: Val Packett <val@packett.cool> Closes: https://lore.kernel.org/all/8f003bfb-8279-4c65-a271-c1e4a029043d@packett.cool/ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 parent 1cda377 commit 8e88563

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

drivers/power/supply/qcom_battmgr.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,6 @@ struct qcom_battmgr_info {
257257
unsigned int capacity_warning;
258258
unsigned int cycle_count;
259259
unsigned int charge_count;
260-
bool charge_ctrl_enable;
261260
unsigned int charge_ctrl_start;
262261
unsigned int charge_ctrl_end;
263262
char model_number[BATTMGR_STRING_LEN];
@@ -660,13 +659,13 @@ static int qcom_battmgr_bat_get_property(struct power_supply *psy,
660659
}
661660

662661
static int qcom_battmgr_set_charge_control(struct qcom_battmgr *battmgr,
663-
bool enable, u32 target_soc, u32 delta_soc)
662+
u32 target_soc, u32 delta_soc)
664663
{
665664
struct qcom_battmgr_charge_ctrl_request request = {
666665
.hdr.owner = cpu_to_le32(PMIC_GLINK_OWNER_BATTMGR),
667666
.hdr.type = cpu_to_le32(PMIC_GLINK_REQ_RESP),
668667
.hdr.opcode = cpu_to_le32(BATTMGR_CHG_CTRL_LIMIT_EN),
669-
.enable = cpu_to_le32(enable),
668+
.enable = cpu_to_le32(1),
670669
.target_soc = cpu_to_le32(target_soc),
671670
.delta_soc = cpu_to_le32(delta_soc),
672671
};
@@ -678,7 +677,6 @@ static int qcom_battmgr_set_charge_start_threshold(struct qcom_battmgr *battmgr,
678677
{
679678
u32 target_soc, delta_soc;
680679
int ret;
681-
bool enable = start_soc != 0;
682680

683681
start_soc = clamp(start_soc, CHARGE_CTRL_START_THR_MIN, CHARGE_CTRL_START_THR_MAX);
684682

@@ -698,10 +696,9 @@ static int qcom_battmgr_set_charge_start_threshold(struct qcom_battmgr *battmgr,
698696
}
699697

700698
mutex_lock(&battmgr->lock);
701-
ret = qcom_battmgr_set_charge_control(battmgr, enable, target_soc, delta_soc);
699+
ret = qcom_battmgr_set_charge_control(battmgr, target_soc, delta_soc);
702700
mutex_unlock(&battmgr->lock);
703701
if (!ret) {
704-
battmgr->info.charge_ctrl_enable = enable;
705702
battmgr->info.charge_ctrl_start = start_soc;
706703
battmgr->info.charge_ctrl_end = target_soc;
707704
}
@@ -713,15 +710,14 @@ static int qcom_battmgr_set_charge_end_threshold(struct qcom_battmgr *battmgr, i
713710
{
714711
u32 delta_soc = CHARGE_CTRL_DELTA_SOC;
715712
int ret;
716-
bool enable = battmgr->info.charge_ctrl_enable;
717713

718714
end_soc = clamp(end_soc, CHARGE_CTRL_END_THR_MIN, CHARGE_CTRL_END_THR_MAX);
719715

720716
if (battmgr->info.charge_ctrl_start && end_soc > battmgr->info.charge_ctrl_start)
721717
delta_soc = end_soc - battmgr->info.charge_ctrl_start;
722718

723719
mutex_lock(&battmgr->lock);
724-
ret = qcom_battmgr_set_charge_control(battmgr, enable, end_soc, delta_soc);
720+
ret = qcom_battmgr_set_charge_control(battmgr, end_soc, delta_soc);
725721
mutex_unlock(&battmgr->lock);
726722
if (!ret) {
727723
battmgr->info.charge_ctrl_start = end_soc - delta_soc;

0 commit comments

Comments
 (0)