aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/power
diff options
context:
space:
mode:
authorDonggeun Kim <dg77.kim@samsung.com>2011-12-27 04:47:49 -0500
committerAnton Vorontsov <cbouatmailru@gmail.com>2012-01-03 23:08:45 -0500
commitad3d13eee78ec44194bf919a37e2f711e53cbdf0 (patch)
treee7a950b1e1d2642c4fae0a7019ac7ceed5241104 /include/linux/power
parent3bb3dbbd56ea39e5537db8f8041ea95d28f16a7f (diff)
power_supply: Charger-Manager: Add properties for power-supply-class
Charger Manager provides power-supply-class aggregating information from multiple chargers and a fuel-gauge. Signed-off-by: Donggeun Kim <dg77.kim@samsung.com> Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Diffstat (limited to 'include/linux/power')
-rw-r--r--include/linux/power/charger-manager.h17
1 files changed, 17 insertions, 0 deletions
diff --git a/include/linux/power/charger-manager.h b/include/linux/power/charger-manager.h
index 102c5b3f3325..4f75e531c112 100644
--- a/include/linux/power/charger-manager.h
+++ b/include/linux/power/charger-manager.h
@@ -47,8 +47,12 @@ struct charger_global_desc {
47 47
48/** 48/**
49 * struct charger_desc 49 * struct charger_desc
50 * @psy_name: the name of power-supply-class for charger manager
50 * @polling_mode: 51 * @polling_mode:
51 * Determine which polling mode will be used 52 * Determine which polling mode will be used
53 * @fullbatt_uV: voltage in microvolt
54 * If it is not being charged and VBATT >= fullbatt_uV,
55 * it is assumed to be full.
52 * @polling_interval_ms: interval in millisecond at which 56 * @polling_interval_ms: interval in millisecond at which
53 * charger manager will monitor battery health 57 * charger manager will monitor battery health
54 * @battery_present: 58 * @battery_present:
@@ -62,11 +66,18 @@ struct charger_global_desc {
62 * return_value > 0: overheat 66 * return_value > 0: overheat
63 * return_value == 0: normal 67 * return_value == 0: normal
64 * return_value < 0: cold 68 * return_value < 0: cold
69 * @measure_battery_temp:
70 * true: measure battery temperature
71 * false: measure ambient temperature
65 */ 72 */
66struct charger_desc { 73struct charger_desc {
74 char *psy_name;
75
67 enum polling_modes polling_mode; 76 enum polling_modes polling_mode;
68 unsigned int polling_interval_ms; 77 unsigned int polling_interval_ms;
69 78
79 unsigned int fullbatt_uV;
80
70 enum data_source battery_present; 81 enum data_source battery_present;
71 82
72 char **psy_charger_stat; 83 char **psy_charger_stat;
@@ -77,6 +88,7 @@ struct charger_desc {
77 char *psy_fuel_gauge; 88 char *psy_fuel_gauge;
78 89
79 int (*temperature_out_of_range)(int *mC); 90 int (*temperature_out_of_range)(int *mC);
91 bool measure_battery_temp;
80}; 92};
81 93
82#define PSY_NAME_MAX 30 94#define PSY_NAME_MAX 30
@@ -92,6 +104,8 @@ struct charger_desc {
92 * @emergency_stop: 104 * @emergency_stop:
93 * When setting true, stop charging 105 * When setting true, stop charging
94 * @last_temp_mC: the measured temperature in milli-Celsius 106 * @last_temp_mC: the measured temperature in milli-Celsius
107 * @psy_name_buf: the name of power-supply-class for charger manager
108 * @charger_psy: power_supply for charger manager
95 * @status_save_ext_pwr_inserted: 109 * @status_save_ext_pwr_inserted:
96 * saved status of external power before entering suspend-to-RAM 110 * saved status of external power before entering suspend-to-RAM
97 * @status_save_batt: 111 * @status_save_batt:
@@ -110,6 +124,9 @@ struct charger_manager {
110 int emergency_stop; 124 int emergency_stop;
111 int last_temp_mC; 125 int last_temp_mC;
112 126
127 char psy_name_buf[PSY_NAME_MAX + 1];
128 struct power_supply charger_psy;
129
113 bool status_save_ext_pwr_inserted; 130 bool status_save_ext_pwr_inserted;
114 bool status_save_batt; 131 bool status_save_batt;
115}; 132};