From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.167.177 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794430597; b=rA+DGP4TuhV48yJzYztcgchmIorcFOIL30mKTVXXK9tJLCjJM0fc0ytHHx/c4yW5ASX1 fgAukwFJrHvuPTd44SwOWOclhuhFL/3HUjkYVbeXezrt10lf4Z+a3yvxNg7i7txENRv5U B6eK8/qpBgALW4qkXgqd6jOL8xJoaQ5JgY8LSsls888UFQWTgZpOv0ZIVAzmISucjB8ZO F7FHyaxiowrRpczdictUtbfnMtv1C+iUDXKs3By6nPLDghHnf21lRyALNv7r8A52e5cJL uZaxUx2+FSeEMknmxYFr8lw/p0/xtMCcreRTvoNOM1bG2iyIQiLjaBHwUSNVFecbQiw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794430597; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=4+m68uKNfuhWa97eAxcw0/ilUPWIJI+gM8aeA06x9S8=; b=CRJBFmCoFXQgOrWzCHR3S6mqel+HDHzKn244hEmRSlw3Qc6WGGoVmcVxWc5tUipcje64 FFEV5GacWOyDgNN7xJzKqVHv3Y95wAKZgR3c3RTTioRDGeyB3Ut6B0JiWYrx8REDRnRVh EolqQh5qBezrgeMAUinxtclOrEUyeVyLWJJ/bQu7jZew0KxmP21WZxZHl/Vt+gq5Rb3Hf iHMfY09UTqKnj1K7RT+GJRm7PChGbH2GjAybctJV2FSfdvCxBNDwtdGuIkRABj/9GuWuA zDjjbxYqyEo4PN8OD9VoEI/h3Zbpxa6coBvp5jsBtMXTg/eAWVSp2xmoKJiZFq94kXQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=WiMZjdjL; arc=none smtp.remote-ip=209.85.167.177 Received: from mail-oi1-f177.google.com (mail-oi1-f177.google.com [209.85.167.177]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D3287606A338 for ; Wed, 11 Nov 2026 20:56:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org D3287606A338 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=WiMZjdjL Received: by mail-oi1-f177.google.com with SMTP id 5614622812f47-53ec9237600so1756860b6e.3 for ; Wed, 11 Nov 2026 12:56:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794430596; x=1795035396; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=4+m68uKNfuhWa97eAxcw0/ilUPWIJI+gM8aeA06x9S8=; b=WiMZjdjL7XP1kSlVKzne1HXIe81uTKetG6TW0lDuLs1XUXan3LfhRzWvbgRHa0melP g3b8aenBAMNM4KlK7NnVz+ajUuELd2INR74crbwv5Ah5HLLNNurOoNeqMAPSUQlCCq/2 qwJuzB9iJaee8ZXafnMc+aMjgPSueumdlAHqKkA0GkhaH4h2B8mibVo01SWElOzwXmlj MpXDtO8fK7kXmOzOpF3tE+fc1nR7o4NqwCKBxvmNpJ1XRhReoLoqRWu22ZjItUECRkcZ kelAl4s+4HBYTTM/4GaHO3rjQLpDlY1n5yTmZi7jX5/JHXnAsWgR1GMXFi6WUhi1L248 ZA1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794430596; x=1795035396; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=4+m68uKNfuhWa97eAxcw0/ilUPWIJI+gM8aeA06x9S8=; b=mGRmNTEFqX7yQ87flsdivdxIspsG2CV0z+kx1H6nZ0FmyieLVy53B8XPTJPHQzWpIT rKyf4x3ls+MiWXDS0vk8ylDP4+6z/yvYXeeXkAs2UuROPBgzJshk25FkNMXq2Uo3Jwyk /HN2jJLZdM1mSBWA3r6mNMRvNaYxlPZrnQXanmnnOpPETsuHThHa2aPx5cr/ljaiI0vc rB77CaqR1inWA97Ctmi9UCNCEOt7xXGsGDGTd++1xjggBJ3qLUWDWWbL0kVfyMUFwja/ W/GncUq+7+rmrq8glqvmdOChhGp9bC3T1ENra/gFIzY0Q+e1iif3n6wIBosAy0qa4XVm QTMQ== X-Forwarded-Encrypted: i=1; AL+hErFOANfoj6OJASMwWk8UmlBbKzGi/7WXdcEHLcsafvX3Khjx4GPCJR/i4on3s0rvxspITa8yvhQCeA==@vger.kernel.org X-Gm-Message-State: APuU4Z9eR8hL8CFrIGjFQz9GnwqyMNRz094c6ufpMjnRfKfLVNCFGPvO CSQRegT3oxDGWFyW1z+uWyRQxjVnaXCxfk2E9YD2w3l/djz1QjatO6vN X-Gm-Gg: AYBFou0yc3fyLIW7TMfQjSgCyNiXTCS7TbAQuA8ZS2Orqd6ZljxAac0vRZdDpS3tfX3 IfxS4eoP2yUCg8z1T8pIZ6Td4jZegz7qV4oVq+3krrqo2grpsu/cYSegwpbazcpnbTdLG43BH// L/Hbu16zNp8gKkhRDi8IWKGaEtmceS0/IyTHlufrz/YLJTTycmUELh/PXywS25HLjlEwtnboHAV YQFO1bXwbw03Ttj78nugELw4jmNiLCP+NeoKIqPdTBULDvzRiszCTbHm9alWzckVgcvhOD8ezLc EvojfoRAzoZ1dwFMD5rSFpqQrtUwPpm9AKwGnmcicoSBJQlEfcy+IeP+KaTvFjO0bIBlybwIvBV c2ZcMJwHBsV/3oJ2CoNYhuHM4vH71TwTZkGb4xZq1E6Tv5pYHRVv8vwUlZ5xx/mmFab9m31mpLU agm79H9vdz/pRDfXNtJLveuDvzqcUYsjbVxBdLrMzQWB96wD0p1eLYeH8MS334tS5FoTP8cWj67 P/G+wfRIz/WW+n89Jvpb81D6qTnPCT7OeOpdButwQjmOVuEAEJbUgxRAk/vQCPxc0MyXWr4Ofbv yNYUa6tiGbv7HA5VKZdtMPkmnEvFFQ== X-Received: by 2002:a05:6808:152b:b0:4f4:be18:5de2 with SMTP id 5614622812f47-56b95163ef6mr2878480b6e.13.1794430595238; Wed, 11 Nov 2026 12:56:35 -0800 (PST) Received: from neuromancer ([75.28.21.198]) by smtp.gmail.com with ESMTPSA id 5614622812f47-56906036028sm6564231b6e.11.2026.11.11.12.56.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2026 12:56:34 -0800 (PST) From: Chris Morgan To: linux-rockchip@lists.infradead.org Cc: mfd@lists.linux.dev, linux-pm@vger.kernel.org, maccraft123mc@gmail.com, heiko@sntech.de, lee@kernel.org, sre@kernel.org, Chris Morgan , Jacob Cook Subject: [PATCH V4 4/7] power: supply: rk817-charger: Resolve boot state of charge from coulomb counter Date: Wed, 11 Nov 2026 14:56:24 -0600 Message-ID: <20261111205627.56652-5-macroalpha82@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261111205627.56652-1-macroalpha82@gmail.com> References: <20261111205627.56652-1-macroalpha82@gmail.com> X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Chris Morgan The boot state of charge comes from PWRON_VOL when OFF_CNT reads three or more and from the coulomb counter otherwise, and both fail in the field. PWRON_VOL is sampled at the power-on instant. A power-on caused by plugging in a charger samples under charge current: on an RG353M it read above the pack's maximum design voltage while the pack was at 74%. An RG DS was seen holding 2.63V in the register while running. Either becomes a wrong percentage on every boot that reaches it. A negative counter was clamped to zero and reported as 0%. The counter itself keeps counting while the system is off: the same RG353M, saved at 74% and charged for 1.5 hours powered off, booted with the counter at full. The BSP driver relies on this: it reads OFF_CNT into a flag it never uses, consults PWRON_VOL only when BAT_CON marks a new battery, and adopts the counter when it diverges from the saved capacity ("system halt last time"). Keep the PWRON_VOL lookup for the first boot, but "guess" the SoC on boot based on available signals such as the stored NVRAM value, the state of charge from the battery voltage (which would be high if charging, or low if discharging, but based on testing within about 10% of the actual value), and the value reported by the gauge. Then, periodically read the OCV value reported when it is available and use that to adjust the gauge if it differs too much from what the OCV says the state of charge should be. This combined with calibrating to full when the battery stops charging while plugged in should give us a better way to report an accurate value of the battery's SOC. Log the counter, saved soc and battery voltage at boot, as the BSP logs its saved and present capacity, so a counter that diverged from the saved soc is visible. Report it when debugging is enabled so as to not spam the dmesg log otherwise. Fixes: 11cb8da0189b ("power: supply: Add charger driver for Rockchip RK817") Co-developed-by: Jacob Cook Signed-off-by: Jacob Cook Signed-off-by: Chris Morgan Acked-by: Lee Jones --- drivers/power/supply/rk817_charger.c | 262 +++++++++++++++++++++------ include/linux/mfd/rk808.h | 2 + 2 files changed, 211 insertions(+), 53 deletions(-) diff --git a/drivers/power/supply/rk817_charger.c b/drivers/power/supply/rk817_charger.c index 939d4fefff14..5b53cf288fcf 100644 --- a/drivers/power/supply/rk817_charger.c +++ b/drivers/power/supply/rk817_charger.c @@ -95,6 +95,15 @@ struct rk817_charger { int bat_voltage_min_design_uv; int bat_voltage_max_design_uv; + /* Battery voltage the PMIC sampled when the system powered on. */ + int boot_voltage_uv; + + /* Rested voltage the gauge latched, 0 if it took no usable pair. */ + int relax_voltage_uv; + + /* Retained for the ocv-capacity table the recalibration needs. */ + struct power_supply_battery_info *bat_info; + /* Values updated periodically by driver for display. */ int charge_now_uah; int volt_avg_uv; @@ -337,6 +346,59 @@ static int rk817_bat_calib_cap(struct rk817_charger *charger) return 0; } +/* + * Calibrated microvolts from one of the gas gauge's 16 bit voltage registers. + * Return voltage (which should never be negative) on success or error (which + * should always be negative) on failure. + */ +static int rk817_bat_voltage_uv(struct rk817_charger *charger, unsigned int reg) +{ + u8 bulk_reg[2]; + int ret; + + ret = regmap_bulk_read(charger->rk808->regmap, reg, bulk_reg, 2); + if (ret) + return ret; + + return (charger->voltage_k * get_unaligned_be16(bulk_reg)) + + 1000 * charger->voltage_b; +} + +/* + * Voltage the gauge latched while the battery was resting. Relax mode only + * samples below RELAX_THRE_CUR, so this is a true open circuit voltage with + * no resistance term. Returns 0 unless the battery is resting now and the + * latched pair is inside the pack's design range. + */ +static int rk817_bat_relax_voltage_uv(struct rk817_charger *charger) +{ + unsigned int need = RK817_RELAX_STS | RK817_RELAX_VOL_UPD; + int relax1_uv, relax2_uv, ret, sts, vol; + + ret = regmap_read(charger->rk808->regmap, RK817_GAS_GAUGE_GG_STS, &sts); + if (ret < 0 || (sts & need) != need) + return 0; + + /* + * If we can't get a read on both values, return 0 instead of + * a valid voltage and report it as a missing OCV value downstream. + */ + relax1_uv = rk817_bat_voltage_uv(charger, RK817_GAS_GAUGE_RELAX_VOL1_H); + if (relax1_uv < 0) + return 0; + relax2_uv = rk817_bat_voltage_uv(charger, RK817_GAS_GAUGE_RELAX_VOL2_H); + if (relax2_uv < 0) + return 0; + + vol = max(relax1_uv, relax2_uv); + + if (vol < charger->bat_voltage_min_design_uv || + vol > charger->bat_voltage_max_design_uv) + return 0; + + return vol; +} + static void rk817_read_props(struct rk817_charger *charger) { int tmp, reg; @@ -372,11 +434,9 @@ static void rk817_read_props(struct rk817_charger *charger) charger->soc = charger->charge_now_uah * 100 / charger->fcc_mah; /* Update reported voltage. */ - regmap_bulk_read(charger->rk808->regmap, RK817_GAS_GAUGE_BAT_VOL_H, - bulk_reg, 2); - tmp = get_unaligned_be16(bulk_reg); - charger->volt_avg_uv = (charger->voltage_k * tmp) + 1000 * - charger->voltage_b; + tmp = rk817_bat_voltage_uv(charger, RK817_GAS_GAUGE_BAT_VOL_H); + if (tmp > 0) + charger->volt_avg_uv = tmp; /* * Update reported current. Note value from registers is a signed 16 @@ -435,6 +495,8 @@ static void rk817_read_props(struct rk817_charger *charger) charger->charger_input_volt_avg_uv = 0; } + charger->relax_voltage_uv = rk817_bat_relax_voltage_uv(charger); + /* Calibrate battery capacity and soc. */ rk817_bat_calib_cap(charger); } @@ -751,15 +813,88 @@ static int rk817_read_battery_nvram_values(struct rk817_charger *charger) return 0; } +/* + * The relax pair is a true rested voltage: where it disagrees with the + * tracked soc by more than 5% (chosen arbitrarily), re-init the counter + * from it. + */ +static void rk817_bat_ocv_recalibrate(struct rk817_charger *charger) +{ + int ocv_soc; + + if (!charger->battery_present) + return; + + if (!charger->relax_voltage_uv) + return; + + ocv_soc = power_supply_batinfo_ocv2cap(charger->bat_info, + charger->relax_voltage_uv, + 20) * 1000; + if (ocv_soc < 0 || abs(ocv_soc - charger->soc) <= 5000) + return; + + dev_dbg(charger->dev, + "OCV %duV disagrees with soc, recalibrating (%d -> %d)\n", + charger->relax_voltage_uv, charger->soc, ocv_soc); + charger->soc = ocv_soc; + rk817_initialize_coulomb_counter(charger, + (ocv_soc * charger->fcc_mah) / 100000); + rk817_record_battery_nvram_values(charger); +} + +/* + * Since we cannot perfectly control the bootloader, we cannot trust the + * POWERON_VOL value. Instead, we have to guess with what we have available; + * the state of charge saved to NVRAM, the SoC reported by the gauge, and + * a lookup of the battery voltage against the OCV table. None of these will + * give us a true value of the state of charge, but it should ensure what we + * report to userspace is "slightly correct" until we can get an OCV value or + * we hit the charge_term_current_ua where we can stop guessing. If we have + * only the NVRAM value and the SoC from the gauge, use the NVRAM value if + * it's within 10% of the gauge SoC, otherwise use the gauge SoC. If we have + * all 3 values, sort them and keep the middle value. Then, drop the first + * or 3rd value (whichever is further away) and average the remaining 2 values. + */ +static int rk817_select_boot_soc(struct rk817_charger *charger, int gauge_soc, + int table_soc, int nvram_soc) +{ + int soc[3]; + + if (table_soc < 0) { + if (abs(gauge_soc - nvram_soc) >= 10000) + return gauge_soc; + return nvram_soc; + } + + /* Sort the values so we can drop the outlier */ + soc[0] = gauge_soc; + soc[1] = table_soc; + soc[2] = nvram_soc; + + if (soc[0] > soc[1]) + swap(soc[0], soc[1]); + if (soc[1] > soc[2]) + swap(soc[1], soc[2]); + if (soc[0] > soc[1]) + swap(soc[0], soc[1]); + + /* Drop whichever end is further from the middle and average the rest. */ + if (soc[1] - soc[0] > soc[2] - soc[1]) + return (soc[1] + soc[2]) / 2; + + return (soc[0] + soc[1]) / 2; +} + static int rk817_read_or_set_full_charge_on_boot(struct rk817_charger *charger, struct power_supply_battery_info *bat_info) { + int ret, reg, tmp, off_cnt, bat_uv, boot_soc, table_soc; struct rk808 *rk808 = charger->rk808; - u8 bulk_reg[4]; - u32 boot_voltage, boot_charge_mah; - int ret, reg, off_time, tmp; + u32 boot_charge_mah; bool first_boot; + u8 bulk_reg[4]; /* * Check if the battery is uninitalized. If it is, the coulomb counter @@ -769,25 +904,23 @@ rk817_read_or_set_full_charge_on_boot(struct rk817_charger *charger, if (ret < 0) return ret; first_boot = reg & RK817_BAT_CON; - /* - * If the battery is uninitialized, use the poweron voltage and an ocv - * lookup to guess our charge. The number won't be very accurate until - * we hit either our minimum voltage (0%) or full charge (100%). - */ + + /* PWRON_VOL only refreshes on a real power-on; bound it to the pack. */ + tmp = rk817_bat_voltage_uv(charger, RK817_GAS_GAUGE_PWRON_VOL_H); + if (tmp < 0) + return tmp; + charger->boot_voltage_uv = clamp(tmp, bat_info->voltage_min_design_uv, + bat_info->voltage_max_design_uv); + if (first_boot) { - regmap_bulk_read(rk808->regmap, RK817_GAS_GAUGE_PWRON_VOL_H, - bulk_reg, 2); - tmp = get_unaligned_be16(bulk_reg); - boot_voltage = (charger->voltage_k * tmp) + - 1000 * charger->voltage_b; /* - * Since only implementation has no working thermistor, assume - * 20C for OCV lookup. If lookup fails, report error with OCV - * table. + * Nothing has been saved yet, so estimate from the boot + * voltage with an ocv lookup. Since only implementation has + * no working thermistor, assume 20C for that lookup. */ charger->soc = power_supply_batinfo_ocv2cap(bat_info, - boot_voltage, - 20) * 1000; + charger->boot_voltage_uv, + 20) * 1000; if (charger->soc < 0) charger->soc = 0; @@ -808,39 +941,47 @@ rk817_read_or_set_full_charge_on_boot(struct rk817_charger *charger, if (ret < 0) return ret; + /* + * The coulomb counter keeps counting while the system is off, + * so take it, capped at full, unless it reads invalid; the + * saved soc is then at most one update interval old. A counter + * that is merely wrong is corrected by the next rested relax + * pair. + */ regmap_bulk_read(rk808->regmap, RK817_GAS_GAUGE_Q_PRES_H3, bulk_reg, 4); tmp = get_unaligned_be32(bulk_reg); - if (tmp < 0) - tmp = 0; - boot_charge_mah = ADC_TO_CHARGE_UAH(tmp, - charger->res_div) / 1000; - /* - * Check if the coulomb counter has been off for more than 30 - * minutes as it tends to drift downward. If so, re-init soc - * with the boot voltage instead. Note the unit values for the - * OFF_CNT register appear to be in decaminutes and stops - * counting at 2550 (0xFF) minutes. BSP kernel used OCV, but - * for me occasionally that would show invalid values. Boot - * voltage is only accurate for me on first poweron (not - * reboots), but we shouldn't ever encounter an OFF_CNT more - * than 0 on a reboot anyway. - */ - regmap_read(rk808->regmap, RK817_GAS_GAUGE_OFF_CNT, &off_time); - if (off_time >= 3) { - regmap_bulk_read(rk808->regmap, - RK817_GAS_GAUGE_PWRON_VOL_H, - bulk_reg, 2); - tmp = get_unaligned_be16(bulk_reg); - boot_voltage = (charger->voltage_k * tmp) + - 1000 * charger->voltage_b; - charger->soc = - power_supply_batinfo_ocv2cap(bat_info, - boot_voltage, - 20) * 1000; + regmap_read(rk808->regmap, RK817_GAS_GAUGE_OFF_CNT, &off_cnt); + bat_uv = rk817_bat_voltage_uv(charger, RK817_GAS_GAUGE_BAT_VOL_H); + if (bat_uv < 0) + return bat_uv; + dev_dbg(charger->dev, + "boot: counter %d uAh, saved soc %d, fcc %d mAh, battery %d uV, off_cnt %d\n", + tmp > 0 ? ADC_TO_CHARGE_UAH(tmp, charger->res_div) : 0, + charger->soc, charger->fcc_mah, bat_uv, off_cnt); + if (tmp > 0) { + boot_charge_mah = ADC_TO_CHARGE_UAH(tmp, + charger->res_div) / 1000; + if (boot_charge_mah > charger->fcc_mah) + boot_charge_mah = charger->fcc_mah; + boot_soc = boot_charge_mah * 100000 / charger->fcc_mah; + + /* + * The gauge re-derives this count from its own ocv + * model while the pack rests, so bound it with the ocv + * table: under load the terminal voltage sits below the + * open circuit voltage, making the table a floor, and + * under charge above it, making it a ceiling on any + * saved soc that would displace the counter. + */ + table_soc = power_supply_batinfo_ocv2cap(bat_info, bat_uv, + 20) * 1000; + + charger->soc = rk817_select_boot_soc(charger, boot_soc, + table_soc, charger->soc); } else { - charger->soc = (boot_charge_mah * 1000 * 100 / - charger->fcc_mah); + dev_dbg(charger->dev, + "coulomb counter invalid, keeping saved soc\n"); } } @@ -1046,6 +1187,7 @@ static void rk817_charging_monitor(struct work_struct *work) charger = container_of(work, struct rk817_charger, work.work); rk817_read_props(charger); + rk817_bat_ocv_recalibrate(charger); /* Run every 8 seconds like the BSP driver did. */ queue_delayed_work(system_percpu_wq, &charger->work, msecs_to_jiffies(8000)); @@ -1058,6 +1200,13 @@ static void rk817_cleanup_node(void *data) of_node_put(node); } +static void rk817_put_battery_info(void *data) +{ + struct rk817_charger *charger = data; + + power_supply_put_battery_info(charger->bat_ps, charger->bat_info); +} + static int rk817_charger_probe(struct platform_device *pdev) { struct rk808 *rk808 = dev_get_drvdata(pdev->dev.parent); @@ -1174,7 +1323,14 @@ static int rk817_charger_probe(struct platform_device *pdev) if (ret) return ret; - power_supply_put_battery_info(charger->bat_ps, bat_info); + /* + * Keep the battery info: the periodic recalibration needs its + * ocv-capacity table for as long as the driver is bound. + */ + charger->bat_info = bat_info; + ret = devm_add_action_or_reset(dev, rk817_put_battery_info, charger); + if (ret) + return ret; plugin_irq = platform_get_irq(pdev, 0); if (plugin_irq < 0) diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h index 7ffc904c864c..72419d311626 100644 --- a/include/linux/mfd/rk808.h +++ b/include/linux/mfd/rk808.h @@ -1211,6 +1211,8 @@ enum rk809_reg_id { #define RK817_GAS_GAUGE_RELAX_THRE_H 0x58 #define RK817_GAS_GAUGE_RELAX_THRE_L 0x59 +#define RK817_GAS_GAUGE_RELAX_VOL1_H 0x5a +#define RK817_GAS_GAUGE_RELAX_VOL2_H 0x5c #define RK817_GAS_GAUGE_OCV_THRE_VOL 0x62 #define RK817_GAS_GAUGE_OCV_VOL_H 0x63 #define RK817_GAS_GAUGE_OCV_VOL_L 0x64 -- 2.53.0