Merge tag 'for-v3.14' of git://git.infradead.org/battery-2.6
Pull battery updates from Dmitry Eremin-Solenikov: "I'm picking up power supply maintainership from Anton Vorontov. Could you please pull battery-2.6 git tree changes prepared for the v3.14 release. Highlights: - Power supply notifier - Several drivers gained DT support - Added Maxim 14577 driver - Change of maintainer" * tag 'for-v3.14' of git://git.infradead.org/battery-2.6: MAINTAINERS: Pick up power supply maintainership max17042_battery: Add IRQF_ONESHOT flag to use default irq handler gpio-charger: Support wakeup events power_supply: Add charger support for Maxim 14577 dt: Binding documentation for isp1704 charger isp1704_charger: Add DT support charger-manager: of_cm_parse_desc() should be static bq2415x_charger: Add DT support power_supply: Add power_supply_get_by_phandle bq2415x_charger: Use power_supply notifier for automode power: reset: Add as3722 power-off driver mfd: AS3722: Add dt node properties for system power controller charger-manager: Support deivce tree in charger manager driver charger-manager: Modify the way of checking battery's temperature power_supply: Add power_supply notifier
This commit is contained in:
Linus Torvalds
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* bq2415x charger driver
|
||||
*
|
||||
* Copyright (C) 2011-2012 Pali Rohár <pali.rohar@gmail.com>
|
||||
* Copyright (C) 2011-2013 Pali Rohár <pali.rohar@gmail.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@@ -31,46 +31,9 @@
|
||||
* termination current. It it is less or equal to zero, configuring charge
|
||||
* and termination current will not be possible.
|
||||
*
|
||||
* Function set_mode_hook is needed for automode (setting correct current
|
||||
* limit when charger is connected/disconnected or setting boost mode).
|
||||
* When is NULL, automode function is disabled. When is not NULL, it must
|
||||
* have this prototype:
|
||||
*
|
||||
* int (*set_mode_hook)(
|
||||
* void (*hook)(enum bq2415x_mode mode, void *data),
|
||||
* void *data)
|
||||
*
|
||||
* hook is hook function (see below) and data is pointer to driver private
|
||||
* data
|
||||
*
|
||||
* bq2415x driver will call it as:
|
||||
*
|
||||
* platform_data->set_mode_hook(bq2415x_hook_function, bq2415x_device);
|
||||
*
|
||||
* Board/platform function set_mode_hook return non zero value when hook
|
||||
* function was successful registered. Platform code should call that hook
|
||||
* function (which get from pointer, with data) every time when charger
|
||||
* was connected/disconnected or require to enable boost mode. bq2415x
|
||||
* driver then will set correct current limit, enable/disable charger or
|
||||
* boost mode.
|
||||
*
|
||||
* Hook function has this prototype:
|
||||
*
|
||||
* void hook(enum bq2415x_mode mode, void *data);
|
||||
*
|
||||
* mode is bq2415x mode (charger or boost)
|
||||
* data is pointer to driver private data (which get from
|
||||
* set_charger_type_hook)
|
||||
*
|
||||
* When bq driver is being unloaded, it call function:
|
||||
*
|
||||
* platform_data->set_mode_hook(NULL, NULL);
|
||||
*
|
||||
* (hook function and driver private data are NULL)
|
||||
*
|
||||
* After that board/platform code must not call driver hook function! It
|
||||
* is possible that pointer to hook function will not be valid and calling
|
||||
* will cause undefined result.
|
||||
* For automode support is needed to provide name of power supply device
|
||||
* in value notify_device. Device driver must immediately report property
|
||||
* POWER_SUPPLY_PROP_CURRENT_MAX when current changed.
|
||||
*/
|
||||
|
||||
/* Supported modes with maximal current limit */
|
||||
@@ -89,8 +52,7 @@ struct bq2415x_platform_data {
|
||||
int charge_current; /* mA */
|
||||
int termination_current; /* mA */
|
||||
int resistor_sense; /* m ohm */
|
||||
int (*set_mode_hook)(void (*hook)(enum bq2415x_mode mode, void *data),
|
||||
void *data);
|
||||
const char *notify_device; /* name */
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -37,6 +37,8 @@ enum cm_event_types {
|
||||
CM_EVENT_BATT_FULL,
|
||||
CM_EVENT_BATT_IN,
|
||||
CM_EVENT_BATT_OUT,
|
||||
CM_EVENT_BATT_OVERHEAT,
|
||||
CM_EVENT_BATT_COLD,
|
||||
CM_EVENT_EXT_PWR_IN_OUT,
|
||||
CM_EVENT_CHG_START_STOP,
|
||||
CM_EVENT_OTHERS,
|
||||
@@ -173,11 +175,10 @@ struct charger_regulator {
|
||||
* @num_charger_regulator: the number of entries in charger_regulators
|
||||
* @charger_regulators: array of charger regulators
|
||||
* @psy_fuel_gauge: the name of power-supply for fuel gauge
|
||||
* @temperature_out_of_range:
|
||||
* Determine whether the status is overheat or cold or normal.
|
||||
* return_value > 0: overheat
|
||||
* return_value == 0: normal
|
||||
* return_value < 0: cold
|
||||
* @thermal_zone : the name of thermal zone for battery
|
||||
* @temp_min : Minimum battery temperature for charging.
|
||||
* @temp_max : Maximum battery temperature for charging.
|
||||
* @temp_diff : Temperature diffential to restart charging.
|
||||
* @measure_battery_temp:
|
||||
* true: measure battery temperature
|
||||
* false: measure ambient temperature
|
||||
@@ -190,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;
|
||||
@@ -203,18 +204,23 @@ 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;
|
||||
|
||||
const char *thermal_zone;
|
||||
|
||||
int temp_min;
|
||||
int temp_max;
|
||||
int temp_diff;
|
||||
|
||||
int (*temperature_out_of_range)(int *mC);
|
||||
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
|
||||
@@ -226,13 +232,13 @@ struct charger_desc {
|
||||
* @desc: instance of charger_desc
|
||||
* @fuel_gauge: power_supply for fuel gauge
|
||||
* @charger_stat: array of power_supply for chargers
|
||||
* @tzd_batt : thermal zone device for battery
|
||||
* @charger_enabled: the state of charger
|
||||
* @fullbatt_vchk_jiffies_at:
|
||||
* jiffies at the time full battery check will occur.
|
||||
* @fullbatt_vchk_work: work queue for full battery check
|
||||
* @emergency_stop:
|
||||
* When setting true, stop charging
|
||||
* @last_temp_mC: the measured temperature in milli-Celsius
|
||||
* @psy_name_buf: the name of power-supply-class for charger manager
|
||||
* @charger_psy: power_supply for charger manager
|
||||
* @status_save_ext_pwr_inserted:
|
||||
@@ -250,13 +256,15 @@ struct charger_manager {
|
||||
struct power_supply *fuel_gauge;
|
||||
struct power_supply **charger_stat;
|
||||
|
||||
#ifdef CONFIG_THERMAL
|
||||
struct thermal_zone_device *tzd_batt;
|
||||
#endif
|
||||
bool charger_enabled;
|
||||
|
||||
unsigned long fullbatt_vchk_jiffies_at;
|
||||
struct delayed_work fullbatt_vchk_work;
|
||||
|
||||
int emergency_stop;
|
||||
int last_temp_mC;
|
||||
|
||||
char psy_name_buf[PSY_NAME_MAX + 1];
|
||||
struct power_supply charger_psy;
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
struct isp1704_charger_data {
|
||||
void (*set_power)(bool on);
|
||||
int enable_gpio;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
#include <linux/workqueue.h>
|
||||
#include <linux/leds.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/notifier.h>
|
||||
|
||||
struct device;
|
||||
|
||||
@@ -158,6 +159,10 @@ enum power_supply_type {
|
||||
POWER_SUPPLY_TYPE_USB_ACA, /* Accessory Charger Adapters */
|
||||
};
|
||||
|
||||
enum power_supply_notifier_events {
|
||||
PSY_EVENT_PROP_CHANGED,
|
||||
};
|
||||
|
||||
union power_supply_propval {
|
||||
int intval;
|
||||
const char *strval;
|
||||
@@ -235,7 +240,18 @@ struct power_supply_info {
|
||||
int use_for_apm;
|
||||
};
|
||||
|
||||
extern struct atomic_notifier_head power_supply_notifier;
|
||||
extern int power_supply_reg_notifier(struct notifier_block *nb);
|
||||
extern void power_supply_unreg_notifier(struct notifier_block *nb);
|
||||
extern struct power_supply *power_supply_get_by_name(const char *name);
|
||||
#ifdef CONFIG_OF
|
||||
extern struct power_supply *power_supply_get_by_phandle(struct device_node *np,
|
||||
const char *property);
|
||||
#else /* !CONFIG_OF */
|
||||
static inline struct power_supply *
|
||||
power_supply_get_by_phandle(struct device_node *np, const char *property)
|
||||
{ return NULL; }
|
||||
#endif /* CONFIG_OF */
|
||||
extern void power_supply_changed(struct power_supply *psy);
|
||||
extern int power_supply_am_i_supplied(struct power_supply *psy);
|
||||
extern int power_supply_set_battery_charged(struct power_supply *psy);
|
||||
|
||||
Reference in New Issue
Block a user