iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: dts: ux500: Switch battery nodes to standard

Browse Source 
This force-converts the per-device battery node into the standard
properties using "simple-battery" for the HREF machines and the
corresponding Samsung battery for the mobile phones.

This is fine to do since the battery data in the DTS files has never
been deployed or used. In commit a1149ae97554
"ARM: ux500: Disable Power Supply and Battery Management by default"
it was turned off and has not been switched back on since. In
the meantime standardized bindings for batteries have appeared
making the old AB8500 battery bindings obsolete.

The battery node which is now in the middle of an included file
is obviously a per-device piece of information so push this down
to each board. The HREF machines all have the same battery and can
share a single node in the HREF dtsi file.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2021-10-07 00:40:08 +02:00
parent 41b086b22f
commit be3a60a943
10 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/boot/dts/ste-ab8500.dtsi
View File

@ -129,11 +129,6 @@
io-channel-names = "aux1", "aux2";
};
ab8500_battery: ab8500_battery {
stericsson,battery-type = "LIPO";
thermistor-on-batctrl;
};
ab8500_fg {
compatible = "stericsson,ab8500-fg";
interrupts = <24 IRQ_TYPE_LEVEL_HIGH>,
@ -146,7 +141,7 @@
"LOW_BAT_F",
"CC_INT_CALIB",
"CCEOC";
battery = <&ab8500_battery>;
monitored-battery = <&battery>;
io-channels = <&gpadc 0x08>;
io-channel-names = "main_bat_v";
};
@ -163,7 +158,7 @@
"BTEMP_HIGH",
"BTEMP_LOW_MEDIUM",
"BTEMP_MEDIUM_HIGH";
battery = <&ab8500_battery>;
monitored-battery = <&battery>;
io-channels = <&gpadc 0x02>,
<&gpadc 0x01>;
io-channel-names = "btemp_ball",
@ -200,7 +195,7 @@
"VBUS_OVV",
"CH_WD_EXP",
"VBUS_CH_DROP_END";
battery = <&ab8500_battery>;
monitored-battery = <&battery>;
vddadc-supply = <&ab8500_ldo_tvout_reg>;
io-channels = <&gpadc 0x03>,
<&gpadc 0x0a>,
@ -214,7 +209,7 @@
ab8500_chargalg {
compatible = "stericsson,ab8500-chargalg";
battery = <&ab8500_battery>;
monitored-battery = <&battery>;
};
ab8500_usb: ab8500_usb {

13
arch/arm/boot/dts/ste-ab8505.dtsi
View File

@ -92,11 +92,6 @@
};
};
ab8500_battery: ab8500_battery {
stericsson,battery-type = "LIPO";
thermistor-on-batctrl;
};
ab8500_fg {
status = "disabled";
compatible = "stericsson,ab8500-fg";
@ -110,7 +105,7 @@
"LOW_BAT_F",
"CC_INT_CALIB",
"CCEOC";
battery = <&ab8500_battery>;
monitored-battery = <&battery>;
io-channels = <&gpadc 0x08>;
io-channel-names = "main_bat_v";
};
@ -128,7 +123,7 @@
"BTEMP_HIGH",
"BTEMP_LOW_MEDIUM",
"BTEMP_MEDIUM_HIGH";
battery = <&ab8500_battery>;
monitored-battery = <&battery>;
io-channels = <&gpadc 0x02>,
<&gpadc 0x01>;
io-channel-names = "btemp_ball",
@ -166,7 +161,7 @@
"VBUS_OVV",
"CH_WD_EXP",
"VBUS_CH_DROP_END";
battery = <&ab8500_battery>;
monitored-battery = <&battery>;
vddadc-supply = <&ab8500_ldo_adc_reg>;
io-channels = <&gpadc 0x09>,
<&gpadc 0x0b>;
@ -177,7 +172,7 @@
ab8500_chargalg {
status = "disabled";
compatible = "stericsson,ab8500-chargalg";
battery = <&ab8500_battery>;
monitored-battery = <&battery>;
};
ab8500_usb: ab8500_usb {

6
arch/arm/boot/dts/ste-href.dtsi
View File

@ -13,6 +13,12 @@
reg = <0x00000000 0x20000000>;
};
battery: battery {
compatible = "simple-battery";
battery-type = "lithium-ion-polymer";
thermistor-on-batctrl;
};
soc {
uart@80120000 {
pinctrl-names = "default", "sleep";

6
arch/arm/boot/dts/ste-snowball.dts
View File

@ -17,6 +17,12 @@
reg = <0x00000000 0x20000000>;
};
battery: battery {
compatible = "simple-battery";
battery-type = "lithium-ion-polymer";
thermistor-on-batctrl;
};
en_3v3_reg: en_3v3 {
compatible = "regulator-fixed";
regulator-name = "en-3v3-fixed-supply";

4
arch/arm/boot/dts/ste-ux500-samsung-codina.dts
View File

@ -43,6 +43,10 @@
stdout-path = &serial2;
};
battery: battery {
compatible = "samsung,eb425161lu";
};
/* TI TXS0206 level translator for 2.9 V */
sd_level_translator: regulator-gpio {
compatible = "regulator-fixed";

4
arch/arm/boot/dts/ste-ux500-samsung-gavini.dts
View File

@ -20,6 +20,10 @@
stdout-path = &serial2;
};
battery: battery {
compatible = "samsung,eb585157lu";
};
/* TI TXS0206 level translator for 2.9 V */
sd_level_translator: regulator-gpio {
compatible = "regulator-fixed";

4
arch/arm/boot/dts/ste-ux500-samsung-golden.dts
View File

@ -25,6 +25,10 @@
stdout-path = &serial2;
};
battery: battery {
compatible = "samsung,eb-l1m7flu";
};
i2c-gpio-0 {
compatible = "i2c-gpio";
sda-gpios = <&gpio2 14 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;

4
arch/arm/boot/dts/ste-ux500-samsung-janice.dts
View File

@ -20,6 +20,10 @@
stdout-path = &serial2;
};
battery: battery {
compatible = "samsung,eb535151vu";
};
/* External LDO for eMMC LDO VMEM_3V3 controlled by GPIO6 */
ldo_3v3_reg: regulator-gpio-ldo-3v3 {
compatible = "regulator-fixed";

4
arch/arm/boot/dts/ste-ux500-samsung-kyle.dts
View File

@ -24,6 +24,10 @@
stdout-path = &serial2;
};
battery: battery {
compatible = "samsung,eb425161la";
};
/* TI TXS0206 level translator for 2.9 V */
sd_level_translator: regulator-gpio {
compatible = "regulator-fixed";

4
arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
View File

@ -20,6 +20,10 @@
stdout-path = &serial2;
};
battery: battery {
compatible = "samsung,eb485159lu";
};
/* TI TXS0206 level translator for 2.9 V */
sd_level_translator: regulator-gpio {
compatible = "regulator-fixed";