Merge tag 'for-v3.9' of git://git.infradead.org/battery-2.6

Pull battery updates from Anton Vorontsov:
 "Four new drivers:

   - goldfish_battery:

     This is Android Emulator battery driver.  Originally from Google,
     but Intel folks reshaped it for mainline

   - pm2301_charger:

     A new driver for ST-Ericsson 2301 Power Management chip, uses
     AB8500 battery management core

   - qnap-poweroff:

     The driver adds poweroff functionality for QNAP NAS boxes

   - restart-poweroff:

     A generic driver that implements 'power off by restarting'.  The
     actual poweroff functionality is implemented through a bootloader,
     so Linux' task is just to restart the box.  The driver is useful on
     Buffalo Linkstation LS-XHL and LS-CHLv2 boards.  Andrew Lunn worked
     on submitting the driver (as well as qnap-poweroff above).

  Additionally:

   - A lot of fixes for ab8500 drivers.  This is a part of efforts of
     syncing internal ST-Ericsson development tree with the mainline.
     Lee Jones @ Linaro worked on compilation and reshaping these
     series.

   - New health properties for the power supplies: "Watchdog timer
     expire" and "Safety timer expire"

   - As usual, a bunch of fixes/cleanups here and there"

* tag 'for-v3.9' of git://git.infradead.org/battery-2.6: (81 commits)
  bq2415x_charger: Add support for offline and 100mA mode
  generic-adc-battery: Fix forever loop in gab_remove()
  goldfish_battery: Add missing GENERIC_HARDIRQS dependency
  da9030_battery: Include notifier.h
  bq27x00_battery: Fix reporting battery temperature
  power/reset: Remove newly introduced __dev* annotations
  lp8727_charger: Small cleanup in naming
  ab8500_btemp: Demote initcall sequence
  ds2782_battery: Add power_supply_changed() calls for proper uevent support
  power: Add battery driver for goldfish emulator
  u8500-charger: Delay for USB enumeration
  ab8500-bm: Remove individual [charger|btemp|fg|chargalg] pdata structures
  ab8500-charger: Do not touch VBUSOVV bits
  ab8500-fg: Use correct battery charge full design
  pm2301: LPN mode control support
  pm2301: Enable vbat low monitoring
  ab8500-bm: Flush all work queues before suspending
  ab8500-fg: Go to INIT_RECOVERY when charger removed
  ab8500-charger: Add support for autopower on AB8505 and AB9540
  abx500-chargalg: Add new sysfs interface to get current charge status
  ...

Fix up fairly straightforward conflicts in the ab8500 driver.  But since
it seems to be ARM-specific, I can't even compile-test the result..

3 files changed, 21 insertions, 36 deletions

diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
index e53dcfeaee69..80e3b8683a84 100644
--- a/include/linux/mfd/abx500.h
+++ b/include/linux/mfd/abx500.h
@@ -131,7 +131,7 @@ struct abx500_maxim_parameters {
  * @nominal_voltage:            Nominal voltage of the battery in mV
  * @termination_vol:            max voltage upto which battery can be charged
  * @termination_curr            battery charging termination current in mA
- * @recharge_vol                battery voltage limit that will trigger a new
+ * @recharge_cap                battery capacity limit that will trigger a new
  *                              full charging cycle in the case where maintenan-
  *                              -ce charging has been disabled
  * @normal_cur_lvl:             charger current in normal state in mA
@@ -160,7 +160,7 @@ struct abx500_battery_type {
         int nominal_voltage;
         int termination_vol;
         int termination_curr;
-        int recharge_vol;
+        int recharge_cap;
         int normal_cur_lvl;
         int normal_vol_lvl;
         int maint_a_cur_lvl;
@@ -224,6 +224,7 @@ struct abx500_bm_charger_parameters {
  * @bkup_bat_v          voltage which we charge the backup battery with
  * @bkup_bat_i          current which we charge the backup battery with
  * @no_maintenance      indicates that maintenance charging is disabled
+ * @capacity_scaling    indicates whether capacity scaling is to be used
  * @abx500_adc_therm    placement of thermistor, batctrl or battemp adc
  * @chg_unknown_bat     flag to enable charging of unknown batteries
  * @enable_overshoot    flag to enable VBAT overshoot control
@@ -253,7 +254,11 @@ struct abx500_bm_data {
         int usb_safety_tmr_h;
         int bkup_bat_v;
         int bkup_bat_i;
+        bool autopower_cfg;
+        bool ac_enabled;
+        bool usb_enabled;
         bool no_maintenance;
+        bool capacity_scaling;
         bool chg_unknown_bat;
         bool enable_overshoot;
         bool auto_trig;
@@ -277,9 +282,9 @@ enum {
         NTC_INTERNAL,
 };
 
-int bmdevs_of_probe(struct device *dev,
-                struct device_node *np,
-                struct abx500_bm_data **battery);
+int ab8500_bm_of_probe(struct device *dev,
+                       struct device_node *np,
+                       struct abx500_bm_data *bm);
 
 int abx500_set_register_interruptible(struct device *dev, u8 bank, u8 reg,
         u8 value);
diff --git a/include/linux/mfd/abx500/ab8500-bm.h b/include/linux/mfd/abx500/ab8500-bm.h
index 9bd037df97d9..8d35bfe164c8 100644
--- a/include/linux/mfd/abx500/ab8500-bm.h
+++ b/include/linux/mfd/abx500/ab8500-bm.h
@@ -23,6 +23,7 @@
  * Bank : 0x5
  */
 #define AB8500_USB_LINE_STAT_REG        0x80
+#define AB8500_USB_LINK1_STAT_REG       0x94
 
 /*
  * Charger / status register offfsets
@@ -225,6 +226,8 @@
 /* BatCtrl Current Source Constants */
 #define BAT_CTRL_7U_ENA                 0x01
 #define BAT_CTRL_20U_ENA                0x02
+#define BAT_CTRL_18U_ENA                0x01
+#define BAT_CTRL_16U_ENA                0x02
 #define BAT_CTRL_CMP_ENA                0x04
 #define FORCE_BAT_CTRL_CMP_HIGH         0x08
 #define BAT_CTRL_PULL_UP_ENA            0x10
@@ -355,6 +358,7 @@ struct ab8500_bm_charger_parameters {
  * @bkup_bat_v          voltage which we charge the backup battery with
  * @bkup_bat_i          current which we charge the backup battery with
  * @no_maintenance      indicates that maintenance charging is disabled
+ * @capacity_scaling    indicates whether capacity scaling is to be used
  * @adc_therm           placement of thermistor, batctrl or battemp adc
  * @chg_unknown_bat     flag to enable charging of unknown batteries
  * @enable_overshoot    flag to enable VBAT overshoot control
@@ -383,6 +387,7 @@ struct ab8500_bm_data {
         int bkup_bat_v;
         int bkup_bat_i;
         bool no_maintenance;
+        bool capacity_scaling;
         bool chg_unknown_bat;
         bool enable_overshoot;
         enum abx500_adc_therm adc_therm;
@@ -399,26 +404,6 @@ struct ab8500_bm_data {
         const struct ab8500_fg_parameters *fg_params;
 };
 
-struct ab8500_charger_platform_data {
-        char **supplied_to;
-        size_t num_supplicants;
-        bool autopower_cfg;
-};
-
-struct ab8500_btemp_platform_data {
-        char **supplied_to;
-        size_t num_supplicants;
-};
-
-struct ab8500_fg_platform_data {
-        char **supplied_to;
-        size_t num_supplicants;
-};
-
-struct ab8500_chargalg_platform_data {
-        char **supplied_to;
-        size_t num_supplicants;
-};
 struct ab8500_btemp;
 struct ab8500_gpadc;
 struct ab8500_fg;
@@ -434,20 +419,10 @@ struct ab8500_fg *ab8500_fg_get(void);
 int ab8500_fg_inst_curr_blocking(struct ab8500_fg *dev);
 int ab8500_fg_inst_curr_start(struct ab8500_fg *di);
 int ab8500_fg_inst_curr_finalize(struct ab8500_fg *di, int *res);
+int ab8500_fg_inst_curr_started(struct ab8500_fg *di);
 int ab8500_fg_inst_curr_done(struct ab8500_fg *di);
 
 #else
 static struct abx500_bm_data ab8500_bm_data;
-
-static inline int ab8500_fg_inst_curr_start(struct ab8500_fg *di)
-{
-        return -ENODEV;
-}
-
-static inline int ab8500_fg_inst_curr_finalize(struct ab8500_fg *di, int *res)
-{
-        return -ENODEV;
-}
-
 #endif
 #endif /* _AB8500_BM_H */
diff --git a/include/linux/mfd/abx500/ux500_chargalg.h b/include/linux/mfd/abx500/ux500_chargalg.h
index 9b07725750c9..d43ac0f35526 100644
--- a/include/linux/mfd/abx500/ux500_chargalg.h
+++ b/include/linux/mfd/abx500/ux500_chargalg.h
@@ -27,12 +27,17 @@ struct ux500_charger_ops {
  * @ops                 ux500 charger operations
  * @max_out_volt        maximum output charger voltage in mV
  * @max_out_curr        maximum output charger current in mA
+ * @enabled             indicates if this charger is used or not
+ * @external            external charger unit (pm2xxx)
  */
 struct ux500_charger {
         struct power_supply psy;
         struct ux500_charger_ops ops;
         int max_out_volt;
         int max_out_curr;
+        int wdt_refresh;
+        bool enabled;
+        bool external;
 };
 
 #endif