android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

power: supply: qti_battery_charger: remove POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT{_MAX}

Browse Source 
With the following commit,

952aeeb3ee ("power_supply: Register power supply for thermal cooling device")

we've psy_register_cooler() trying to register a thermal cooling
device when a power supply has POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT
property. However, it fails as the power supply is not initialized.

This leads to a probe failure of qti_battery_charger driver as
the battery power supply registration fails.

9.045419:   BATTERY_CHG: battery_chg_init_psy: Failed to register battery power supply, rc=-11
9.056065:   qti_battery_charger: probe of soc:qcom,pmic_glink:qcom,battery_charger failed with error -11

In previous kernel versions like 5.10 or 5.15, we've the following
commit picked up in ACK tree to address this issue.

113b63538cba ("FROMLIST: power_supply: Register cooling device outside of probe")

However, in 6.1 tree, we don't have the same picked up yet. While
discussing this with upstream folks, the following commit addresses
the issue by removing the code that's causing it.

c85c191694cb ("power: supply: remove faulty cooling logic")

Until this becomes available in qcom-6.1 tree, remove the following
power supply properties POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT{_MAX}
so that qti_battery_charger driver can probe successfully.

There is a limitation with this change as it won't allow the user
or client to do thermal mitigation for limiting battery charging
current.

Change-Id: I343375d88b7858ad939ff85cfa53855448ea61ee
Signed-off-by: Subbaraman Narayanamurthy <quic_subbaram@quicinc.com>
This commit is contained in:
Subbaraman Narayanamurthy 2023-03-09 14:33:56 -08:00
parent 350fa7d7f1
commit 6f0d7b68de
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/power/supply/qti_battery_charger.c
View File

@ -1388,8 +1388,6 @@ static enum power_supply_property battery_props[] = {
POWER_SUPPLY_PROP_VOLTAGE_NOW,
POWER_SUPPLY_PROP_VOLTAGE_MAX,
POWER_SUPPLY_PROP_CURRENT_NOW,
POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT,
POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX,
POWER_SUPPLY_PROP_CHARGE_CONTROL_START_THRESHOLD,
POWER_SUPPLY_PROP_CHARGE_CONTROL_END_THRESHOLD,
POWER_SUPPLY_PROP_TEMP,