* [RFC PATCH 2/3] power: supply: qcom_battmgr: add Xiaomi taoyao support
2026-07-30 9:34 [RFC PATCH 0/3] Add Xiaomi 12 Lite 5G (taoyao) battery support Stanislav Zaikin
2026-07-30 9:35 ` [RFC PATCH 1/3] dt-bindings: soc: qcom: add xiaomi,taoyao-pmic-glink compatible Stanislav Zaikin
@ 2026-07-30 9:35 ` Stanislav Zaikin
2026-07-30 9:35 ` [RFC PATCH 3/3] arm64: dts: qcom: sm7325-xiaomi-taoyao: switch to device-specific pmic-glink compatible Stanislav Zaikin
2 siblings, 0 replies; 4+ messages in thread
From: Stanislav Zaikin @ 2026-07-30 9:35 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Sebastian Reichel
Cc: linux-arm-msm, devicetree, linux-kernel, linux-pm,
Stanislav Zaikin
The Xiaomi taoyao firmware defines an additional BATT_CONSTANT_CURRENT
property (ID 12) between BATT_CHG_CTRL_LIM_MAX and BATT_TEMP, shifting
all higher battery property IDs by one.
Signed-off-by: Stanislav Zaikin <zstaseg@gmail.com>
---
drivers/power/supply/qcom_battmgr.c | 86 +++++++++++++++++++++++++++--
1 file changed, 82 insertions(+), 4 deletions(-)
diff --git a/drivers/power/supply/qcom_battmgr.c b/drivers/power/supply/qcom_battmgr.c
index 490137a23d00..390d7c75e36f 100644
--- a/drivers/power/supply/qcom_battmgr.c
+++ b/drivers/power/supply/qcom_battmgr.c
@@ -24,6 +24,7 @@ enum qcom_battmgr_variant {
QCOM_BATTMGR_SM8350,
QCOM_BATTMGR_SM8550,
QCOM_BATTMGR_X1E80100,
+ QCOM_BATTMGR_TAOYAO,
};
#define BATTMGR_BAT_STATUS 0x1
@@ -451,16 +452,87 @@ static const u8 sm8350_bat_prop_map[] = {
[POWER_SUPPLY_PROP_CHARGE_CONTROL_END_THRESHOLD] = BATT_CHG_CTRL_END_THR,
};
+/*
+ * Xiaomi Taoyao firmware has BATT_CONSTANT_CURRENT (ID 12) inserted
+ * between BATT_CHG_CTRL_LIM_MAX and BATT_TEMP, shifting all subsequent
+ * IDs by one.
+ */
+static const u8 taoyao_bat_prop_map[] = {
+ [POWER_SUPPLY_PROP_STATUS] = BATT_STATUS,
+ [POWER_SUPPLY_PROP_HEALTH] = BATT_HEALTH,
+ [POWER_SUPPLY_PROP_PRESENT] = BATT_PRESENT,
+ [POWER_SUPPLY_PROP_CHARGE_TYPE] = BATT_CHG_TYPE,
+ [POWER_SUPPLY_PROP_CAPACITY] = BATT_CAPACITY,
+ [POWER_SUPPLY_PROP_VOLTAGE_OCV] = BATT_VOLT_OCV,
+ [POWER_SUPPLY_PROP_VOLTAGE_NOW] = BATT_VOLT_NOW,
+ [POWER_SUPPLY_PROP_VOLTAGE_MAX] = BATT_VOLT_MAX,
+ [POWER_SUPPLY_PROP_CURRENT_NOW] = BATT_CURR_NOW,
+ [POWER_SUPPLY_PROP_TEMP] = BATT_TEMP + 1,
+ [POWER_SUPPLY_PROP_TECHNOLOGY] = BATT_TECHNOLOGY + 1,
+ [POWER_SUPPLY_PROP_CHARGE_COUNTER] = BATT_CHG_COUNTER + 1,
+ [POWER_SUPPLY_PROP_CYCLE_COUNT] = BATT_CYCLE_COUNT + 1,
+ [POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN] = BATT_CHG_FULL_DESIGN + 1,
+ [POWER_SUPPLY_PROP_CHARGE_FULL] = BATT_CHG_FULL + 1,
+ [POWER_SUPPLY_PROP_MODEL_NAME] = BATT_MODEL_NAME + 1,
+ [POWER_SUPPLY_PROP_TIME_TO_FULL_AVG] = BATT_TTF_AVG + 1,
+ [POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG] = BATT_TTE_AVG + 1,
+ [POWER_SUPPLY_PROP_INTERNAL_RESISTANCE] = BATT_RESISTANCE + 1,
+ [POWER_SUPPLY_PROP_STATE_OF_HEALTH] = BATT_SOH,
+ [POWER_SUPPLY_PROP_POWER_NOW] = BATT_POWER_NOW + 1,
+ [POWER_SUPPLY_PROP_CHARGE_CONTROL_START_THRESHOLD] = BATT_CHG_CTRL_START_THR + 1,
+ [POWER_SUPPLY_PROP_CHARGE_CONTROL_END_THRESHOLD] = BATT_CHG_CTRL_END_THR + 1,
+};
+
+/*
+ * Reverse mapping from Xiaomi Taoyao firmware property IDs to canonical
+ * kernel property IDs.
+ */
+static const u8 taoyao_to_canonical[] = {
+ [BATT_STATUS] = BATT_STATUS,
+ [BATT_HEALTH] = BATT_HEALTH,
+ [BATT_PRESENT] = BATT_PRESENT,
+ [BATT_CHG_TYPE] = BATT_CHG_TYPE,
+ [BATT_CAPACITY] = BATT_CAPACITY,
+ [BATT_SOH] = BATT_SOH,
+ [BATT_VOLT_OCV] = BATT_VOLT_OCV,
+ [BATT_VOLT_NOW] = BATT_VOLT_NOW,
+ [BATT_VOLT_MAX] = BATT_VOLT_MAX,
+ [BATT_CURR_NOW] = BATT_CURR_NOW,
+ [BATT_CHG_CTRL_LIM] = BATT_CHG_CTRL_LIM,
+ [BATT_CHG_CTRL_LIM_MAX] = BATT_CHG_CTRL_LIM_MAX,
+ [BATT_CHG_CTRL_LIM_MAX + 1] = 0xff, /* BATT_CONSTANT_CURRENT - never requested */
+ [BATT_TEMP + 1] = BATT_TEMP,
+ [BATT_TECHNOLOGY + 1] = BATT_TECHNOLOGY,
+ [BATT_CHG_COUNTER + 1] = BATT_CHG_COUNTER,
+ [BATT_CYCLE_COUNT + 1] = BATT_CYCLE_COUNT,
+ [BATT_CHG_FULL_DESIGN + 1] = BATT_CHG_FULL_DESIGN,
+ [BATT_CHG_FULL + 1] = BATT_CHG_FULL,
+ [BATT_MODEL_NAME + 1] = BATT_MODEL_NAME,
+ [BATT_TTF_AVG + 1] = BATT_TTF_AVG,
+ [BATT_TTE_AVG + 1] = BATT_TTE_AVG,
+ [BATT_RESISTANCE + 1] = BATT_RESISTANCE,
+ [BATT_POWER_NOW + 1] = BATT_POWER_NOW,
+ [BATT_POWER_AVG + 1] = BATT_POWER_AVG,
+ [BATT_CHG_CTRL_EN + 1] = BATT_CHG_CTRL_EN,
+ [BATT_CHG_CTRL_START_THR + 1] = BATT_CHG_CTRL_START_THR,
+ [BATT_CHG_CTRL_END_THR + 1] = BATT_CHG_CTRL_END_THR,
+};
+
static int qcom_battmgr_bat_sm8350_update(struct qcom_battmgr *battmgr,
enum power_supply_property psp)
{
unsigned int prop;
int ret;
- if (psp >= ARRAY_SIZE(sm8350_bat_prop_map))
- return -EINVAL;
-
- prop = sm8350_bat_prop_map[psp];
+ if (battmgr->variant == QCOM_BATTMGR_TAOYAO) {
+ if (psp >= ARRAY_SIZE(taoyao_bat_prop_map))
+ return -EINVAL;
+ prop = taoyao_bat_prop_map[psp];
+ } else {
+ if (psp >= ARRAY_SIZE(sm8350_bat_prop_map))
+ return -EINVAL;
+ prop = sm8350_bat_prop_map[psp];
+ }
mutex_lock(&battmgr->lock);
ret = qcom_battmgr_request_property(battmgr, BATTMGR_BAT_PROPERTY_GET, prop, 0);
@@ -1381,6 +1453,11 @@ static void qcom_battmgr_sm8350_callback(struct qcom_battmgr *battmgr,
switch (opcode) {
case BATTMGR_BAT_PROPERTY_GET:
property = le32_to_cpu(resp->intval.property);
+
+ if (battmgr->variant == QCOM_BATTMGR_TAOYAO &&
+ property < ARRAY_SIZE(taoyao_to_canonical))
+ property = taoyao_to_canonical[property];
+
if (property == BATT_MODEL_NAME) {
if (payload_len != sizeof(resp->strval)) {
dev_warn(battmgr->dev,
@@ -1617,6 +1694,7 @@ static const struct of_device_id qcom_battmgr_of_variants[] = {
{ .compatible = "qcom,sc8280xp-pmic-glink", .data = (void *)QCOM_BATTMGR_SC8280XP },
{ .compatible = "qcom,sm8550-pmic-glink", .data = (void *)QCOM_BATTMGR_SM8550 },
{ .compatible = "qcom,x1e80100-pmic-glink", .data = (void *)QCOM_BATTMGR_X1E80100 },
+ { .compatible = "xiaomi,taoyao-pmic-glink", .data = (void *)QCOM_BATTMGR_TAOYAO },
/* Unmatched devices falls back to QCOM_BATTMGR_SM8350 */
{}
};
--
2.53.0
^ permalink raw reply related [flat|nested] 4+ messages in thread