Merge tag 'for-v3.8-merged' of git://git.infradead.org/battery-2.6
[~shefty/rdma-dev.git] / arch / arm / boot / dts / dbx5x0.dtsi
index 0d69322f689f03bbe16b1d061d33cd847ced989f..2efd9c891bc91f85522a6158854fd14e89b7f65f 100644 (file)
                                        vddadc-supply = <&ab8500_ldo_tvout_reg>;
                                };
 
-                               ab8500-usb {
+                               ab8500_battery: ab8500_battery {
+                                       stericsson,battery-type = "LIPO";
+                                       thermistor-on-batctrl;
+                               };
+
+                               ab8500_fg {
+                                       compatible = "stericsson,ab8500-fg";
+                                       battery    = <&ab8500_battery>;
+                               };
+
+                               ab8500_btemp {
+                                       compatible = "stericsson,ab8500-btemp";
+                                       battery    = <&ab8500_battery>;
+                               };
+
+                               ab8500_charger {
+                                       compatible      = "stericsson,ab8500-charger";
+                                       battery         = <&ab8500_battery>;
+                                       vddadc-supply   = <&ab8500_ldo_tvout_reg>;
+                               };
+
+                               ab8500_chargalg {
+                                       compatible      = "stericsson,ab8500-chargalg";
+                                       battery         = <&ab8500_battery>;
+                               };
+
+                               ab8500_usb {
                                        compatible = "stericsson,ab8500-usb";
                                        interrupts = < 90 0x4
                                                       96 0x4