Merge tag 'mfd-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[pandora-kernel.git] / include / linux / mfd / abx500.h

diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
index 76ca1ba..9ead60b 100644 (file)
--- 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);