Hi Linus, On Thu, Oct 07, 2021 at 12:40:08AM +0200, Linus Walleij wrote: > 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 > --- > Sebastian: I will merge this patch to the Ux500 tree when/if you > merge the two other patches, so all is fixed up in linux-next and > in the merge window. Thanks, I just merged patch 1 & 2. -- Sebastian > --- > arch/arm/boot/dts/ste-ab8500.dtsi | 13 ++++--------- > arch/arm/boot/dts/ste-ab8505.dtsi | 13 ++++--------- > arch/arm/boot/dts/ste-href.dtsi | 6 ++++++ > arch/arm/boot/dts/ste-snowball.dts | 6 ++++++ > arch/arm/boot/dts/ste-ux500-samsung-codina.dts | 4 ++++ > arch/arm/boot/dts/ste-ux500-samsung-gavini.dts | 4 ++++ > arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 4 ++++ > arch/arm/boot/dts/ste-ux500-samsung-janice.dts | 4 ++++ > arch/arm/boot/dts/ste-ux500-samsung-kyle.dts | 4 ++++ > arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 4 ++++ > 10 files changed, 44 insertions(+), 18 deletions(-) > > diff --git a/arch/arm/boot/dts/ste-ab8500.dtsi b/arch/arm/boot/dts/ste-ab8500.dtsi > index 9baf927f9b95..2cf19386a525 100644 > --- a/arch/arm/boot/dts/ste-ab8500.dtsi > +++ b/arch/arm/boot/dts/ste-ab8500.dtsi > @@ -129,11 +129,6 @@ ab8500_temp { > 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 @@ ab8500_fg { > "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 @@ ab8500_btemp { > "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 @@ ab8500_charger { > "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_charger { > > ab8500_chargalg { > compatible = "stericsson,ab8500-chargalg"; > - battery = <&ab8500_battery>; > + monitored-battery = <&battery>; > }; > > ab8500_usb: ab8500_usb { > diff --git a/arch/arm/boot/dts/ste-ab8505.dtsi b/arch/arm/boot/dts/ste-ab8505.dtsi > index 8d018701a680..e98335e9d1cb 100644 > --- a/arch/arm/boot/dts/ste-ab8505.dtsi > +++ b/arch/arm/boot/dts/ste-ab8505.dtsi > @@ -92,11 +92,6 @@ usb_id: channel@e { > }; > }; > > - ab8500_battery: ab8500_battery { > - stericsson,battery-type = "LIPO"; > - thermistor-on-batctrl; > - }; > - > ab8500_fg { > status = "disabled"; > compatible = "stericsson,ab8500-fg"; > @@ -110,7 +105,7 @@ ab8500_fg { > "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 @@ ab8500_btemp { > "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 @@ ab8500_charger { > "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_charger { > ab8500_chargalg { > status = "disabled"; > compatible = "stericsson,ab8500-chargalg"; > - battery = <&ab8500_battery>; > + monitored-battery = <&battery>; > }; > > ab8500_usb: ab8500_usb { > diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi > index 961f2c7274ce..718752a0248e 100644 > --- a/arch/arm/boot/dts/ste-href.dtsi > +++ b/arch/arm/boot/dts/ste-href.dtsi > @@ -13,6 +13,12 @@ memory { > reg = <0x00000000 0x20000000>; > }; > > + battery: battery { > + compatible = "simple-battery"; > + battery-type = "lithium-ion-polymer"; > + thermistor-on-batctrl; > + }; > + > soc { > uart@80120000 { > pinctrl-names = "default", "sleep"; > diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts > index 934fc788fe1d..fb719c8a8eb2 100644 > --- a/arch/arm/boot/dts/ste-snowball.dts > +++ b/arch/arm/boot/dts/ste-snowball.dts > @@ -17,6 +17,12 @@ memory { > 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"; > diff --git a/arch/arm/boot/dts/ste-ux500-samsung-codina.dts b/arch/arm/boot/dts/ste-ux500-samsung-codina.dts > index 952606e607ed..fbd60065542d 100644 > --- a/arch/arm/boot/dts/ste-ux500-samsung-codina.dts > +++ b/arch/arm/boot/dts/ste-ux500-samsung-codina.dts > @@ -43,6 +43,10 @@ chosen { > stdout-path = &serial2; > }; > > + battery: battery { > + compatible = "samsung,eb425161lu"; > + }; > + > /* TI TXS0206 level translator for 2.9 V */ > sd_level_translator: regulator-gpio { > compatible = "regulator-fixed"; > diff --git a/arch/arm/boot/dts/ste-ux500-samsung-gavini.dts b/arch/arm/boot/dts/ste-ux500-samsung-gavini.dts > index fabc390ccb0c..47bbf5ab267f 100644 > --- a/arch/arm/boot/dts/ste-ux500-samsung-gavini.dts > +++ b/arch/arm/boot/dts/ste-ux500-samsung-gavini.dts > @@ -20,6 +20,10 @@ chosen { > stdout-path = &serial2; > }; > > + battery: battery { > + compatible = "samsung,eb585157lu"; > + }; > + > /* TI TXS0206 level translator for 2.9 V */ > sd_level_translator: regulator-gpio { > compatible = "regulator-fixed"; > diff --git a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts > index ee6379ab688c..fc4c5166d85b 100644 > --- a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts > +++ b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts > @@ -25,6 +25,10 @@ chosen { > 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)>; > diff --git a/arch/arm/boot/dts/ste-ux500-samsung-janice.dts b/arch/arm/boot/dts/ste-ux500-samsung-janice.dts > index f14cf316a70a..2c914c58f8ba 100644 > --- a/arch/arm/boot/dts/ste-ux500-samsung-janice.dts > +++ b/arch/arm/boot/dts/ste-ux500-samsung-janice.dts > @@ -20,6 +20,10 @@ chosen { > 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"; > diff --git a/arch/arm/boot/dts/ste-ux500-samsung-kyle.dts b/arch/arm/boot/dts/ste-ux500-samsung-kyle.dts > index 3b825666d302..9ec3f85b1a18 100644 > --- a/arch/arm/boot/dts/ste-ux500-samsung-kyle.dts > +++ b/arch/arm/boot/dts/ste-ux500-samsung-kyle.dts > @@ -24,6 +24,10 @@ chosen { > stdout-path = &serial2; > }; > > + battery: battery { > + compatible = "samsung,eb425161la"; > + }; > + > /* TI TXS0206 level translator for 2.9 V */ > sd_level_translator: regulator-gpio { > compatible = "regulator-fixed"; > diff --git a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts > index 264f3e9b5fce..37020127f6e7 100644 > --- a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts > +++ b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts > @@ -20,6 +20,10 @@ chosen { > stdout-path = &serial2; > }; > > + battery: battery { > + compatible = "samsung,eb485159lu"; > + }; > + > /* TI TXS0206 level translator for 2.9 V */ > sd_level_translator: regulator-gpio { > compatible = "regulator-fixed"; > -- > 2.31.1 >