evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "qcom-charger: expand data structure smb_chg_param"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-26 14:48:20 -07:00 • committed by Gerrit - the friendly Code Review server
commit cf174274e9
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/power/qcom-charger/smb-lib.c
View file

@ -134,7 +134,10 @@ int smblib_get_charge_param(struct smb_charger *chg,
return rc;
}
*val_u = val_raw * param->step_u + param->min_u;
if (param->get_proc)
*val_u = param->get_proc(param, val_raw);
else
*val_u = val_raw * param->step_u + param->min_u;
smblib_dbg(chg, PR_REGISTER, "%s = %d (0x%02x)\n",
param->name, *val_u, val_raw);
@ -216,13 +219,20 @@ int smblib_set_charge_param(struct smb_charger *chg,
int rc = 0;
u8 val_raw;
if (val_u > param->max_u || val_u < param->min_u) {
dev_err(chg->dev, "%s: %d is out of range [%d, %d]\n",
param->name, val_u, param->min_u, param->max_u);
return -EINVAL;
if (param->set_proc) {
rc = param->set_proc(param, val_u, &val_raw);
if (rc < 0)
return -EINVAL;
} else {
if (val_u > param->max_u || val_u < param->min_u) {
dev_err(chg->dev, "%s: %d is out of range [%d, %d]\n",
param->name, val_u, param->min_u, param->max_u);
return -EINVAL;
}
val_raw = (val_u - param->min_u) / param->step_u;
}
val_raw = (val_u - param->min_u) / param->step_u;
rc = smblib_write(chg, param->reg, val_raw);
if (rc < 0) {
dev_err(chg->dev, "%s: Couldn't write 0x%02x to 0x%04x rc=%d\n",

5
drivers/power/qcom-charger/smb-lib.h
View file

@ -56,6 +56,11 @@ struct smb_chg_param {
int min_u;
int max_u;
int step_u;
int (*get_proc)(struct smb_chg_param *param,
u8 val_raw);
int (*set_proc)(struct smb_chg_param *param,
int val_u,
u8 *val_raw);
};
struct smb_params {