From: Dzmitry Sankouski <dsankouski@gmail.com>
To: Hans de Goede <hdegoede@redhat.com>,
Krzysztof Kozlowski <krzk@kernel.org>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>,
Purism Kernel Team <kernel@puri.sm>,
Sebastian Reichel <sre@kernel.org>,
Rob Herring <robh@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Alim Akhtar <alim.akhtar@samsung.com>,
Shawn Guo <shawnguo@kernel.org>,
Sascha Hauer <s.hauer@pengutronix.de>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Fabio Estevam <festevam@gmail.com>,
Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konradybcio@kernel.org>
Cc: linux-pm@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, imx@lists.linux.dev,
linux-arm-msm@vger.kernel.org,
Dzmitry Sankouski <dsankouski@gmail.com>
Subject: [PATCH 3/4] power: supply: max17042: use microvolts for voltage comparison
Date: Sat, 09 Nov 2024 15:44:35 +0300 [thread overview]
Message-ID: <20241109-b4-max17042-v1-3-9e2b07e54e76@gmail.com> (raw)
In-Reply-To: <20241109-b4-max17042-v1-0-9e2b07e54e76@gmail.com>
Do not convert VCELL register value from uV to mV to compare
with vmin/vmax. Rather use uV for vim/vmax, since that's a
standard measure unit in power supply drivers.
Convert "maxim,dead-volt" and "maxim,over-volt" to uV.
Signed-off-by: Dzmitry Sankouski <dsankouski@gmail.com>
---
Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml | 2 +-
arch/arm/boot/dts/samsung/exynos4210-i9100.dts | 2 +-
arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi | 2 +-
arch/arm/boot/dts/samsung/exynos4412-midas.dtsi | 2 +-
arch/arm/boot/dts/samsung/exynos4412-p4note.dtsi | 2 +-
arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 2 +-
arch/arm64/boot/dts/qcom/msm8916-motorola-harpia.dts | 4 ++--
arch/arm64/boot/dts/qcom/msm8916-motorola-osprey.dts | 4 ++--
arch/arm64/boot/dts/qcom/msm8916-motorola-surnia.dts | 4 ++--
arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 2 +-
drivers/power/supply/max17042_battery.c | 4 ----
11 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml b/Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml
index e98ffdad1ec3..d1ad597e0837 100644
--- a/Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml
+++ b/Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml
@@ -83,7 +83,7 @@ examples:
reg = <0x36>;
maxim,rsns-microohm = <10000>;
maxim,over-heat-temp = <600>;
- maxim,over-volt = <4300>;
+ maxim,over-volt = <4300000>;
shared-irq;
};
};
diff --git a/arch/arm/boot/dts/samsung/exynos4210-i9100.dts b/arch/arm/boot/dts/samsung/exynos4210-i9100.dts
index 0d8495792a70..0ca755160bef 100644
--- a/arch/arm/boot/dts/samsung/exynos4210-i9100.dts
+++ b/arch/arm/boot/dts/samsung/exynos4210-i9100.dts
@@ -150,7 +150,7 @@ battery@36 {
reg = <0x36>;
maxim,over-heat-temp = <700>;
- maxim,over-volt = <4500>;
+ maxim,over-volt = <4500000>;
};
};
diff --git a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi
index 9bc05961577d..758bfc10826f 100644
--- a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi
+++ b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi
@@ -186,7 +186,7 @@ fuel-gauge@36 {
pinctrl-0 = <&max77693_fuel_irq>;
maxim,over-heat-temp = <500>;
- maxim,over-volt = <4500>;
+ maxim,over-volt = <450000>;
};
};
diff --git a/arch/arm/boot/dts/samsung/exynos4412-midas.dtsi b/arch/arm/boot/dts/samsung/exynos4412-midas.dtsi
index 3d5aace668dc..c744907b7c42 100644
--- a/arch/arm/boot/dts/samsung/exynos4412-midas.dtsi
+++ b/arch/arm/boot/dts/samsung/exynos4412-midas.dtsi
@@ -263,7 +263,7 @@ fuel-gauge@36 {
reg = <0x36>;
maxim,over-heat-temp = <700>;
- maxim,over-volt = <4500>;
+ maxim,over-volt = <4500000>;
};
};
diff --git a/arch/arm/boot/dts/samsung/exynos4412-p4note.dtsi b/arch/arm/boot/dts/samsung/exynos4412-p4note.dtsi
index 28a605802733..3d52aa25c83c 100644
--- a/arch/arm/boot/dts/samsung/exynos4412-p4note.dtsi
+++ b/arch/arm/boot/dts/samsung/exynos4412-p4note.dtsi
@@ -175,7 +175,7 @@ fuel-gauge@36 {
interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
maxim,rsns-microohm = <10000>;
maxim,over-heat-temp = <600>;
- maxim,over-volt = <4300>;
+ maxim,over-volt = <4300000>;
};
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi b/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
index 1b39514d5c12..90beefaa644f 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
@@ -1141,7 +1141,7 @@ bat: fuel-gauge@36 {
pinctrl-0 = <&pinctrl_gauge>;
power-supplies = <&bq25895>;
maxim,over-heat-temp = <700>;
- maxim,over-volt = <4500>;
+ maxim,over-volt = <4500000>;
maxim,rsns-microohm = <5000>;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-motorola-harpia.dts b/arch/arm64/boot/dts/qcom/msm8916-motorola-harpia.dts
index 8380451ebbf6..a02ece82ff5b 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-motorola-harpia.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-motorola-harpia.dts
@@ -25,8 +25,8 @@ battery@36 {
maxim,rsns-microohm = <10000>;
maxim,over-heat-temp = <600>;
maxim,cold-temp = <(-200)>;
- maxim,dead-volt = <3200>;
- maxim,over-volt = <4500>;
+ maxim,dead-volt = <3200000>;
+ maxim,over-volt = <4500000>;
};
/* charger@6b */
diff --git a/arch/arm64/boot/dts/qcom/msm8916-motorola-osprey.dts b/arch/arm64/boot/dts/qcom/msm8916-motorola-osprey.dts
index ec5589fc69bd..f567b7ffb613 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-motorola-osprey.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-motorola-osprey.dts
@@ -36,8 +36,8 @@ battery@36 {
maxim,rsns-microohm = <10000>;
maxim,over-heat-temp = <600>;
maxim,cold-temp = <(-200)>;
- maxim,dead-volt = <3200>;
- maxim,over-volt = <4500>;
+ maxim,dead-volt = <3200000>;
+ maxim,over-volt = <4500000>;
};
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-motorola-surnia.dts b/arch/arm64/boot/dts/qcom/msm8916-motorola-surnia.dts
index eecf78ba45bb..45ddd17243e7 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-motorola-surnia.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-motorola-surnia.dts
@@ -25,8 +25,8 @@ battery@36 {
maxim,rsns-microohm = <10000>;
maxim,over-heat-temp = <600>;
maxim,cold-temp = <(-200)>;
- maxim,dead-volt = <3200>;
- maxim,over-volt = <4500>;
+ maxim,dead-volt = <3200000>;
+ maxim,over-volt = <4500000>;
};
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
index fbd2caf405d5..2c387c8b6344 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
@@ -105,7 +105,7 @@ fuelgauge@36 {
maxim,rsns-microohm = <10000>;
maxim,over-heat-temp = <600>;
- maxim,over-volt = <4400>;
+ maxim,over-volt = <4400000>;
interrupt-parent = <&tlmm>;
interrupts = <121 IRQ_TYPE_EDGE_FALLING>;
diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c
index f3d89d4d5c42..ea212cb10360 100644
--- a/drivers/power/supply/max17042_battery.c
+++ b/drivers/power/supply/max17042_battery.c
@@ -182,8 +182,6 @@ static int max17042_get_battery_health(struct max17042_chip *chip, int *health)
/* bits [0-3] unused */
vavg = val * 625 / 8;
- /* Convert to millivolts */
- vavg /= 1000;
ret = regmap_read(chip->regmap, MAX17042_VCELL, &val);
if (ret < 0)
@@ -191,8 +189,6 @@ static int max17042_get_battery_health(struct max17042_chip *chip, int *health)
/* bits [0-3] unused */
vbatt = val * 625 / 8;
- /* Convert to millivolts */
- vbatt /= 1000;
if (vavg < chip->pdata->vmin) {
*health = POWER_SUPPLY_HEALTH_DEAD;
--
2.39.2
next prev parent reply other threads:[~2024-11-09 12:44 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-09 12:44 [PATCH 0/4] power: supply: max17042: cleanup and more features Dzmitry Sankouski
2024-11-09 12:44 ` [PATCH 1/4] dt-bindings: power: supply: max17042: add share-irq node Dzmitry Sankouski
2024-11-09 13:49 ` Krzysztof Kozlowski
2024-11-09 14:42 ` Rob Herring (Arm)
2024-11-09 12:44 ` [PATCH 2/4] power: supply: max17042: implement dts shared-irq Dzmitry Sankouski
2024-11-09 12:44 ` Dzmitry Sankouski [this message]
2024-11-09 13:48 ` [PATCH 3/4] power: supply: max17042: use microvolts for voltage comparison Krzysztof Kozlowski
2024-11-09 12:44 ` [PATCH 4/4] power: supply: max17042: rename maxim,rsns-microohm property Dzmitry Sankouski
2024-11-09 13:48 ` Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241109-b4-max17042-v1-3-9e2b07e54e76@gmail.com \
--to=dsankouski@gmail.com \
--cc=alim.akhtar@samsung.com \
--cc=andersson@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=hdegoede@redhat.com \
--cc=imx@lists.linux.dev \
--cc=kernel@pengutronix.de \
--cc=kernel@puri.sm \
--cc=konradybcio@kernel.org \
--cc=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=robh@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=sebastian.krzyszkowiak@puri.sm \
--cc=shawnguo@kernel.org \
--cc=sre@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.