Merge tag 'pci-v5.16-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / ste-ab8505.dtsi

diff --git a/arch/arm/boot/dts/ste-ab8505.dtsi b/arch/arm/boot/dts/ste-ab8505.dtsi
index 8d01870..e98335e 100644 (file)
--- a/arch/arm/boot/dts/ste-ab8505.dtsi
+++ b/arch/arm/boot/dts/ste-ab8505.dtsi
@@ -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 {