hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

power: bq24735-charger: add 'ti,external-control' option 

Implement an 'ti,external-control' option for when the charger
shouldn't be configured by the host.

Signed-off-by: Jonathan Tinkham <sctincman@gmail.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
This commit is contained in:
Jonathan Tinkham 2016-02-02 23:03:45 -07:00 committed by Sebastian Reichel
parent a60da83fd8
commit 64024ac7bb
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/power/bq24735-charger.c
View File

@ -106,6 +106,9 @@ static int bq24735_update_word(struct i2c_client *client, u8 reg,
static inline int bq24735_enable_charging(struct bq24735 *charger) static inline int bq24735_enable_charging(struct bq24735 *charger)
{ {
if (charger->pdata->ext_control)
return 0;
return bq24735_update_word(charger->client, BQ24735_CHG_OPT, return bq24735_update_word(charger->client, BQ24735_CHG_OPT,
BQ24735_CHG_OPT_CHARGE_DISABLE, BQ24735_CHG_OPT_CHARGE_DISABLE,
~BQ24735_CHG_OPT_CHARGE_DISABLE); ~BQ24735_CHG_OPT_CHARGE_DISABLE);
@ -113,6 +116,9 @@ static inline int bq24735_enable_charging(struct bq24735 *charger)
static inline int bq24735_disable_charging(struct bq24735 *charger) static inline int bq24735_disable_charging(struct bq24735 *charger)
{ {
if (charger->pdata->ext_control)
return 0;
return bq24735_update_word(charger->client, BQ24735_CHG_OPT, return bq24735_update_word(charger->client, BQ24735_CHG_OPT,
BQ24735_CHG_OPT_CHARGE_DISABLE, BQ24735_CHG_OPT_CHARGE_DISABLE,
BQ24735_CHG_OPT_CHARGE_DISABLE); BQ24735_CHG_OPT_CHARGE_DISABLE);
@ -124,6 +130,9 @@ static int bq24735_config_charger(struct bq24735 *charger)
int ret; int ret;
u16 value; u16 value;
if (pdata->ext_control)
return 0;
if (pdata->charge_current) { if (pdata->charge_current) {
value = pdata->charge_current & BQ24735_CHARGE_CURRENT_MASK; value = pdata->charge_current & BQ24735_CHARGE_CURRENT_MASK;
@ -322,6 +331,8 @@ static struct bq24735_platform *bq24735_parse_dt_data(struct i2c_client *client)
if (!ret) if (!ret)
pdata->input_current = val; pdata->input_current = val;
pdata->ext_control = of_property_read_bool(np, "ti,external-control");
return pdata; return pdata;
} }

2
include/linux/power/bq24735-charger.h
View File

@ -32,6 +32,8 @@ struct bq24735_platform {
int status_gpio_active_low; int status_gpio_active_low;
bool status_gpio_valid; bool status_gpio_valid;
bool ext_control;
char **supplied_to; char **supplied_to;
size_t num_supplicants; size_t num_supplicants;
}; };