Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

power: bq24190_charger: set system params from dts #4

Merged
merged 10 commits into from
Dec 11, 2016
Merged

power: bq24190_charger: set system params from dts #4

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e5154eb
power: bq24190_charger: set system params from dts
networkimprov Dec 7, 2016
1b3512d
power: bq24190_charger: set system params from dts (squash into previ…
networkimprov Dec 7, 2016
f80d58e
power: bq24190_charger: set system params from dts (squash into previ…
networkimprov Dec 7, 2016
dce6823
power: bq24190_charger: set system params from dts (squash into prev…
networkimprov Dec 7, 2016
2e4960d
power: bq24190_charger: set system params from dts (squash into previ…
networkimprov Dec 7, 2016
7b43cdd
power: bq24190_charger: set system params from dts (squash into previ…
networkimprov Dec 7, 2016
f84e74b
power: bq24190_charger: set system params from dts (squash into previ…
networkimprov Dec 8, 2016
cff0aaf
power: bq24190_charger: set system params from dts (squash into previ…
networkimprov Dec 8, 2016
745db58
power: bq24190_charger: set system params from dts (squash into previ…
networkimprov Dec 10, 2016
0ebc422
power: bq24190_charger: set system params from dts (squash into previ…
networkimprov Dec 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 83 additions & 12 deletions drivers/power/bq24190_charger.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
#define BQ24190_REG_POC_SYS_MIN_SHIFT 1
#define BQ24190_REG_POC_BOOST_LIM_MASK BIT(0)
#define BQ24190_REG_POC_BOOST_LIM_SHIFT 0
#define BQ24190_REG_POC_SYS_MIN_MIN 3000
#define BQ24190_REG_POC_SYS_MIN_MAX 3700

#define BQ24190_REG_CCC 0x02 /* Charge Current Control */
#define BQ24190_REG_CCC_ICHG_MASK (BIT(7) | BIT(6) | BIT(5) | \
Expand All @@ -59,6 +61,10 @@
#define BQ24190_REG_PCTCC_ITERM_MASK (BIT(3) | BIT(2) | BIT(1) | \
BIT(0))
#define BQ24190_REG_PCTCC_ITERM_SHIFT 0
#define BQ24190_REG_PCTCC_IPRECHG_MIN 128
#define BQ24190_REG_PCTCC_IPRECHG_MAX 2048
#define BQ24190_REG_PCTCC_ITERM_MIN 128
#define BQ24190_REG_PCTCC_ITERM_MAX 2048

#define BQ24190_REG_CVC 0x04 /* Charge Voltage Control */
#define BQ24190_REG_CVC_VREG_MASK (BIT(7) | BIT(6) | BIT(5) | \
Expand Down Expand Up @@ -156,6 +162,9 @@ struct bq24190_dev_info {
kernel_ulong_t model;
unsigned int gpio_int;
unsigned int irq;
u16 sys_min;
u16 iprechg;
u16 iterm;
rwlock_t f_reg_lock;
bool initialized;
bool irq_event;
Expand Down Expand Up @@ -480,19 +489,20 @@ static int bq24190_sysfs_create_group(struct bq24190_dev_info *bdi)
static inline void bq24190_sysfs_remove_group(struct bq24190_dev_info *bdi) {}
#endif

/*
* According to the "Host Mode and default Mode" section of the
* manual, a write to any register causes the bq24190 to switch
* from default mode to host mode. It will switch back to default
* mode after a WDT timeout unless the WDT is turned off as well.
* So, by simply turning off the WDT, we accomplish both with the
* same write.
*/
static int bq24190_set_mode_host(struct bq24190_dev_info *bdi)
static int bq24190_set_operating_params(struct bq24190_dev_info *bdi)
{
int ret;
u8 v;

/*
* According to the "Host Mode and default Mode" section of the
* manual, a write to any register causes the bq24190 to switch
* from default mode to host mode. It will switch back to default
* mode after a WDT timeout unless the WDT is turned off as well.
* So, by simply turning off the WDT, we accomplish both with the
* same write.
*/

ret = bq24190_read(bdi, BQ24190_REG_CTTC, &v);
if (ret < 0)
return ret;
Expand All @@ -501,7 +511,41 @@ static int bq24190_set_mode_host(struct bq24190_dev_info *bdi)
BQ24190_REG_CTTC_WATCHDOG_SHIFT);
v &= ~BQ24190_REG_CTTC_WATCHDOG_MASK;

return bq24190_write(bdi, BQ24190_REG_CTTC, v);
ret = bq24190_write(bdi, BQ24190_REG_CTTC, v);
if (ret < 0)
return ret;

if (bdi->sys_min) {
v = bdi->sys_min / 100 - 30; // manual section 9.5.1.2, table 9
ret = bq24190_write_mask(bdi, BQ24190_REG_POC,
BQ24190_REG_POC_SYS_MIN_MASK,
BQ24190_REG_POC_SYS_MIN_SHIFT,
v);
if (ret < 0)
return ret;
}

if (bdi->iprechg) {
v = bdi->iprechg / 128 - 1; // manual section 9.5.1.4, table 11
ret = bq24190_write_mask(bdi, BQ24190_REG_PCTCC,
BQ24190_REG_PCTCC_IPRECHG_MASK,
BQ24190_REG_PCTCC_IPRECHG_SHIFT,
v);
if (ret < 0)
return ret;
}

if (bdi->iterm) {
v = bdi->iterm / 128 - 1; // manual section 9.5.1.4, table 11
ret = bq24190_write_mask(bdi, BQ24190_REG_PCTCC,
BQ24190_REG_PCTCC_ITERM_MASK,
BQ24190_REG_PCTCC_ITERM_SHIFT,
v);
if (ret < 0)
return ret;
}

return 0;
}

static int bq24190_register_reset(struct bq24190_dev_info *bdi)
Expand Down Expand Up @@ -1277,7 +1321,7 @@ static int bq24190_hw_init(struct bq24190_dev_info *bdi)
if (ret < 0)
goto out;

ret = bq24190_set_mode_host(bdi);
ret = bq24190_set_operating_params(bdi);
if (ret < 0)
goto out;

Expand All @@ -1290,10 +1334,36 @@ static int bq24190_hw_init(struct bq24190_dev_info *bdi)
#ifdef CONFIG_OF
static int bq24190_setup_dt(struct bq24190_dev_info *bdi)
{
u32 input;

bdi->irq = irq_of_parse_and_map(bdi->dev->of_node, 0);
if (bdi->irq <= 0)
return -1;

if (of_property_read_u32(bdi->dev->of_node, "ti,minimum-sys-voltage", &input) == 0) {
if (input >= BQ24190_REG_POC_SYS_MIN_MIN
&& input <= BQ24190_REG_POC_SYS_MIN_MAX)
bdi->sys_min = input;
else
dev_err(bdi->dev, "invalid value for ti,minimum-sys-voltage: %u\n", input);
}

if (of_property_read_u32(bdi->dev->of_node, "ti,precharge-current", &input) == 0) {
if (input >= BQ24190_REG_PCTCC_IPRECHG_MIN
&& input <= BQ24190_REG_PCTCC_IPRECHG_MAX)
bdi->iprechg = input;
else
dev_err(bdi->dev, "invalid value for ti,precharge-current: %u\n", input);
}

if (of_property_read_u32(bdi->dev->of_node, "ti,termination-current", &input) == 0) {
if (input >= BQ24190_REG_PCTCC_ITERM_MIN
&& input <= BQ24190_REG_PCTCC_ITERM_MAX)
bdi->iterm = input;
else
dev_err(bdi->dev, "invalid value for ti,termination-current: %u\n", input);
}

return 0;
}
#else
Expand Down Expand Up @@ -1356,6 +1426,7 @@ static int bq24190_probe(struct i2c_client *client,
bdi->dev = dev;
bdi->model = id->driver_data;
strncpy(bdi->model_name, id->name, I2C_NAME_SIZE);
bdi->sys_min = bdi->iprechg = bdi->iterm = 0;
rwlock_init(&bdi->f_reg_lock);
bdi->f_reg = 0;
bdi->ss_reg = BQ24190_REG_SS_VBUS_STAT_MASK;
Expand Down Expand Up @@ -1507,7 +1578,7 @@ static int bq24190_pm_resume(struct device *dev)

pm_runtime_get_sync(bdi->dev);
bq24190_register_reset(bdi);
bq24190_set_mode_host(bdi);
bq24190_set_operating_params(bdi);
bq24190_read(bdi, BQ24190_REG_SS, &bdi->ss_reg);
pm_runtime_put_sync(bdi->dev);

Expand Down