diff options
author | Jonghwa Lee <jonghwa3.lee@samsung.com> | 2013-12-18 01:42:35 -0500 |
---|---|---|
committer | Anton Vorontsov <anton@enomsg.org> | 2013-12-23 20:10:07 -0500 |
commit | 856ee6115e2de98cb83389ce18116e6d5b90e817 (patch) | |
tree | 2af5c8a176f41b26940f87c9416b9ece79363a6d /include | |
parent | 5c49a6256bed52f639ed70d252b1c91d1ab899d6 (diff) |
charger-manager: Support deivce tree in charger manager driver
Charger-manager can parse charger_desc data from devicetree which is used
to register charger manager.
Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
Signed-off-by: Myungjoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/power/charger-manager.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/power/charger-manager.h b/include/linux/power/charger-manager.h index 9aec0293f204..07e7945a1ff2 100644 --- a/include/linux/power/charger-manager.h +++ b/include/linux/power/charger-manager.h | |||
@@ -191,7 +191,7 @@ struct charger_regulator { | |||
191 | * max_duration_ms', cm start charging. | 191 | * max_duration_ms', cm start charging. |
192 | */ | 192 | */ |
193 | struct charger_desc { | 193 | struct charger_desc { |
194 | char *psy_name; | 194 | const char *psy_name; |
195 | 195 | ||
196 | enum polling_modes polling_mode; | 196 | enum polling_modes polling_mode; |
197 | unsigned int polling_interval_ms; | 197 | unsigned int polling_interval_ms; |
@@ -204,14 +204,14 @@ struct charger_desc { | |||
204 | 204 | ||
205 | enum data_source battery_present; | 205 | enum data_source battery_present; |
206 | 206 | ||
207 | char **psy_charger_stat; | 207 | const char **psy_charger_stat; |
208 | 208 | ||
209 | int num_charger_regulators; | 209 | int num_charger_regulators; |
210 | struct charger_regulator *charger_regulators; | 210 | struct charger_regulator *charger_regulators; |
211 | 211 | ||
212 | char *psy_fuel_gauge; | 212 | const char *psy_fuel_gauge; |
213 | 213 | ||
214 | char *thermal_zone; | 214 | const char *thermal_zone; |
215 | 215 | ||
216 | int temp_min; | 216 | int temp_min; |
217 | int temp_max; | 217 | int temp_max; |
@@ -219,8 +219,8 @@ struct charger_desc { | |||
219 | 219 | ||
220 | bool measure_battery_temp; | 220 | bool measure_battery_temp; |
221 | 221 | ||
222 | u64 charging_max_duration_ms; | 222 | u32 charging_max_duration_ms; |
223 | u64 discharging_max_duration_ms; | 223 | u32 discharging_max_duration_ms; |
224 | }; | 224 | }; |
225 | 225 | ||
226 | #define PSY_NAME_MAX 30 | 226 | #define PSY_NAME_MAX 30 |