Rename maxim,rsns-microohm to common shunt-resistor-micro-ohms.
Signed-off-by: Dzmitry Sankouski <dsankouski@xxxxxxxxx>
---
Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml | 5 ++---
arch/arm/boot/dts/samsung/exynos4412-p4note.dtsi | 2 +-
arch/arm64/boot/dts/freescale/imx8mq-librem5-r4.dts | 2 +-
arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 2 +-
arch/arm64/boot/dts/qcom/msm8916-motorola-harpia.dts | 2 +-
arch/arm64/boot/dts/qcom/msm8916-motorola-osprey.dts | 2 +-
arch/arm64/boot/dts/qcom/msm8916-motorola-surnia.dts | 2 +-
arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 2 +-
drivers/power/supply/max17042_battery.c | 2 +-
9 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml b/Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml
index d1ad597e0837..754d9ad3d94b 100644
--- a/Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml
+++ b/Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml
@@ -29,8 +29,7 @@ properties:
description: |
The ALRT pin, an open-drain interrupt.
- maxim,rsns-microohm:
- $ref: /schemas/types.yaml#/definitions/uint32
+ shunt-resistor-micro-ohms:
description: |
Resistance of rsns resistor in micro Ohms (datasheet-recommended value is 10000).
Defining this property enables current-sense functionality.
@@ -81,7 +80,7 @@ examples:
battery@36 {
compatible = "maxim,max17042";
reg = <0x36>;
- maxim,rsns-microohm = <10000>;
+ shunt-resistor-micro-ohms = <10000>;
maxim,over-heat-temp = <600>;
maxim,over-volt = <4300000>;
shared-irq;
diff --git a/arch/arm/boot/dts/samsung/exynos4412-p4note.dtsi b/arch/arm/boot/dts/samsung/exynos4412-p4note.dtsi
index 3d52aa25c83c..0b08d23366d6 100644
--- a/arch/arm/boot/dts/samsung/exynos4412-p4note.dtsi
+++ b/arch/arm/boot/dts/samsung/exynos4412-p4note.dtsi
@@ -173,7 +173,7 @@ fuel-gauge@36 {
pinctrl-names = "default";
interrupt-parent = <&gpx2>;
interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
- maxim,rsns-microohm = <10000>;
+ shunt-resistor-micro-ohms = <10000>;
maxim,over-heat-temp = <600>;
maxim,over-volt = <4300000>;
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-librem5-r4.dts b/arch/arm64/boot/dts/freescale/imx8mq-librem5-r4.dts
index 33f398b48119..99023f302a05 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq-librem5-r4.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mq-librem5-r4.dts
@@ -11,7 +11,7 @@ / {
};
&bat {
- maxim,rsns-microohm = <1667>;
+ shunt-resistor-micro-ohms = <1667>;
};
&led_backlight {
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi b/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
index 90beefaa644f..6f6ce14afbdc 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
@@ -1142,7 +1142,7 @@ bat: fuel-gauge@36 {
power-supplies = <&bq25895>;
maxim,over-heat-temp = <700>;
maxim,over-volt = <4500000>;
- maxim,rsns-microohm = <5000>;
+ shunt-resistor-micro-ohms = <5000>;
};
bq25895: charger@6a {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-motorola-harpia.dts b/arch/arm64/boot/dts/qcom/msm8916-motorola-harpia.dts
index a02ece82ff5b..f5d636db33c8 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-motorola-harpia.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-motorola-harpia.dts
@@ -22,7 +22,7 @@ battery@36 {
pinctrl-0 = <&battery_alert_default>;
pinctrl-names = "default";
- maxim,rsns-microohm = <10000>;
+ shunt-resistor-micro-ohms = <10000>;
maxim,over-heat-temp = <600>;
maxim,cold-temp = <(-200)>;
maxim,dead-volt = <3200000>;
diff --git a/arch/arm64/boot/dts/qcom/msm8916-motorola-osprey.dts b/arch/arm64/boot/dts/qcom/msm8916-motorola-osprey.dts
index f567b7ffb613..35343b1fd737 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-motorola-osprey.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-motorola-osprey.dts
@@ -33,7 +33,7 @@ battery@36 {
pinctrl-0 = <&battery_alert_default>;
pinctrl-names = "default";
- maxim,rsns-microohm = <10000>;
+ shunt-resistor-micro-ohms = <10000>;
maxim,over-heat-temp = <600>;
maxim,cold-temp = <(-200)>;
maxim,dead-volt = <3200000>;
diff --git a/arch/arm64/boot/dts/qcom/msm8916-motorola-surnia.dts b/arch/arm64/boot/dts/qcom/msm8916-motorola-surnia.dts
index 45ddd17243e7..855f8a554a9b 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-motorola-surnia.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-motorola-surnia.dts
@@ -22,7 +22,7 @@ battery@36 {
pinctrl-0 = <&battery_alert_default>;
pinctrl-names = "default";
- maxim,rsns-microohm = <10000>;
+ shunt-resistor-micro-ohms = <10000>;
maxim,over-heat-temp = <600>;
maxim,cold-temp = <(-200)>;
maxim,dead-volt = <3200000>;
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 2c387c8b6344..0ab64154dc77 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
@@ -103,7 +103,7 @@ fuelgauge@36 {
compatible = "maxim,max77849-battery";
reg = <0x36>;
- maxim,rsns-microohm = <10000>;
+ shunt-resistor-micro-ohms = <10000>;
maxim,over-heat-temp = <600>;
maxim,over-volt = <4400000>;
diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c
index ea212cb10360..497cb6f14bd9 100644
--- a/drivers/power/supply/max17042_battery.c
+++ b/drivers/power/supply/max17042_battery.c
@@ -916,7 +916,7 @@ max17042_get_of_pdata(struct max17042_chip *chip)
* Require current sense resistor value to be specified for
* current-sense functionality to be enabled at all.
*/
- if (of_property_read_u32(np, "maxim,rsns-microohm", &prop) == 0) {
+ if (of_property_read_u32(np, "shunt-resistor-micro-ohms", &prop) == 0) {
pdata->r_sns = prop;
pdata->enable_current_sense = true;
}
--
2.39.2
