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

Merge "qcom-charger: qpnp-smb2: use values from hardware for default settings"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-03 21:12:48 -07:00 • committed by Gerrit - the friendly Code Review server
commit bb61ebf654
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/power/qcom-charger/qpnp-smb2.c
View file

@ -25,9 +25,6 @@
#include "smb-lib.h" #include "smb-lib.h"
#include "pmic-voter.h" #include "pmic-voter.h"
#define SMB2_DEFAULT_FCC_UA 3000000
#define SMB2_DEFAULT_FV_UV 4350000
#define SMB2_DEFAULT_ICL_UA 3000000
#define SMB2_DEFAULT_WPWR_UW 8000000 #define SMB2_DEFAULT_WPWR_UW 8000000
static struct smb_params v1_params = { static struct smb_params v1_params = {
@ -159,22 +156,22 @@ static int smb2_parse_dt(struct smb2 *chip)
rc = of_property_read_u32(node, rc = of_property_read_u32(node,
"qcom,fcc-max-ua", &chip->dt.fcc_ua); "qcom,fcc-max-ua", &chip->dt.fcc_ua);
if (rc < 0) if (rc < 0)
chip->dt.fcc_ua = SMB2_DEFAULT_FCC_UA; chip->dt.fcc_ua = -EINVAL;
rc = of_property_read_u32(node, rc = of_property_read_u32(node,
"qcom,fv-max-uv", &chip->dt.fv_uv); "qcom,fv-max-uv", &chip->dt.fv_uv);
if (rc < 0) if (rc < 0)
chip->dt.fv_uv = SMB2_DEFAULT_FV_UV; chip->dt.fv_uv = -EINVAL;
rc = of_property_read_u32(node, rc = of_property_read_u32(node,
"qcom,usb-icl-ua", &chip->dt.usb_icl_ua); "qcom,usb-icl-ua", &chip->dt.usb_icl_ua);
if (rc < 0) if (rc < 0)
chip->dt.usb_icl_ua = SMB2_DEFAULT_ICL_UA; chip->dt.usb_icl_ua = -EINVAL;
rc = of_property_read_u32(node, rc = of_property_read_u32(node,
"qcom,dc-icl-ua", &chip->dt.dc_icl_ua); "qcom,dc-icl-ua", &chip->dt.dc_icl_ua);
if (rc < 0) if (rc < 0)
chip->dt.dc_icl_ua = SMB2_DEFAULT_ICL_UA; chip->dt.dc_icl_ua = -EINVAL;
rc = of_property_read_u32(node, rc = of_property_read_u32(node,
"qcom,wipower-max-uw", &chip->dt.wipower_max_uw); "qcom,wipower-max-uw", &chip->dt.wipower_max_uw);
@ -725,6 +722,20 @@ static int smb2_init_hw(struct smb2 *chip)
struct smb_charger *chg = &chip->chg; struct smb_charger *chg = &chip->chg;
int rc; int rc;
if (chip->dt.fcc_ua < 0)
smblib_get_charge_param(chg, &chg->param.fcc, &chip->dt.fcc_ua);
if (chip->dt.fv_uv < 0)
smblib_get_charge_param(chg, &chg->param.fv, &chip->dt.fv_uv);
if (chip->dt.usb_icl_ua < 0)
smblib_get_charge_param(chg, &chg->param.usb_icl,
&chip->dt.usb_icl_ua);
if (chip->dt.dc_icl_ua < 0)
smblib_get_charge_param(chg, &chg->param.dc_icl,
&chip->dt.dc_icl_ua);
/* votes must be cast before configuring software control */ /* votes must be cast before configuring software control */
vote(chg->pl_disable_votable, vote(chg->pl_disable_votable,
USBIN_ICL_VOTER, true, 0); USBIN_ICL_VOTER, true, 0);