summaryrefslogtreecommitdiffstats
path: root/include/linux/power
diff options
context:
space:
mode:
authorJonghwa Lee2013-12-18 07:42:35 +0100
committerAnton Vorontsov2013-12-24 02:10:07 +0100
commit856ee6115e2de98cb83389ce18116e6d5b90e817 (patch)
tree2af5c8a176f41b26940f87c9416b9ece79363a6d /include/linux/power
parentcharger-manager: Modify the way of checking battery's temperature (diff)
downloadkernel-qcow2-linux-856ee6115e2de98cb83389ce18116e6d5b90e817.tar.gz
kernel-qcow2-linux-856ee6115e2de98cb83389ce18116e6d5b90e817.tar.xz
kernel-qcow2-linux-856ee6115e2de98cb83389ce18116e6d5b90e817.zip
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/linux/power')
-rw-r--r--include/linux/power/charger-manager.h12
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 {
* max_duration_ms', cm start charging.
*/
struct charger_desc {
- char *psy_name;
+ const char *psy_name;
enum polling_modes polling_mode;
unsigned int polling_interval_ms;
@@ -204,14 +204,14 @@ struct charger_desc {
enum data_source battery_present;
- char **psy_charger_stat;
+ const char **psy_charger_stat;
int num_charger_regulators;
struct charger_regulator *charger_regulators;
- char *psy_fuel_gauge;
+ const char *psy_fuel_gauge;
- char *thermal_zone;
+ const char *thermal_zone;
int temp_min;
int temp_max;
@@ -219,8 +219,8 @@ struct charger_desc {
bool measure_battery_temp;
- u64 charging_max_duration_ms;
- u64 discharging_max_duration_ms;
+ u32 charging_max_duration_ms;
+ u32 discharging_max_duration_ms;
};
#define PSY_NAME_MAX 30