aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKalle Komierowski <kalle.komierowski@gmail.com>2011-04-01 14:35:09 +0200
committerPhilippe Langlais <philippe.langlais@linaro.org>2011-07-22 15:43:46 +0200
commit3e6764b94f2fd2ef9e0d8952ee3b44969f1b7b1c (patch)
tree85536a06e2ed3f655254561bf9b85288bd7fce9d /include
parent854265b815f8409f520e7bcf149bfc9b14b34bf2 (diff)
power: ab8500_bm: Removal of maintenance charging
This patch makes it possible to remove the maintenance A and B charging states and replaces them with a state that restarts the charging when the battery voltage level dropped below a certain level. The maintenance charging can now be turned of by setting a flag in the board configuration. ST-Ericsson Linux Next: - ST-Ericsson ID: CR333019 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ie5e8ab20a3b57a1028d544371b10ffbb1fd77660 Signed-off-by: Kalle Komierowski <kalle.komierowski@gmail.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/19916 Reviewed-by: Johan GARDSMARK <johan.gardsmark@stericsson.com> Reviewed-by: Johan PALSSON <johan.palsson@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Karl KOMIEROWSKI <karl.komierowski@stericsson.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/mfd/ab8500/bm.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/mfd/ab8500/bm.h b/include/linux/mfd/ab8500/bm.h
index 068b63a93ce..2ca4d8779cb 100644
--- a/include/linux/mfd/ab8500/bm.h
+++ b/include/linux/mfd/ab8500/bm.h
@@ -312,6 +312,10 @@ struct ab8500_maxim_parameters {
* @charge_full_design: Maximum battery capacity in mAh
* @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
+ * full charging cycle in the case where maintenan-
+ * -ce charging has been disabled
* @normal_cur_lvl: charger current in normal state in mA
* @normal_vol_lvl: charger voltage in normal state in mV
* @maint_a_cur_lvl: charger current in maintenance A state in mA
@@ -336,6 +340,7 @@ struct battery_type {
int nominal_voltage;
int termination_vol;
int termination_curr;
+ int recharge_vol;
int normal_cur_lvl;
int normal_vol_lvl;
int maint_a_cur_lvl;
@@ -393,6 +398,7 @@ struct ab8500_bm_charger_parameters {
* @usb_safety_tmr_h safety timer for usb charger
* @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
* @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
@@ -417,6 +423,7 @@ struct ab8500_bm_data {
int usb_safety_tmr_h;
int bkup_bat_v;
int bkup_bat_i;
+ bool no_maintenance;
bool chg_unknown_bat;
bool enable_overshoot;
enum adc_therm adc_therm;