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

Merge "smb138x: support usbin-usbin with external rsense"

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-05 20:21:27 -07:00 • committed by Gerrit - the friendly Code Review server
commit ad7c7b10d1
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/power/supply/qcom/smb138x-charger.c
View file

@ -577,13 +577,15 @@ static int smb138x_parallel_get_prop(struct power_supply *psy,
rc = smblib_get_usb_suspend(chg, &val->intval); rc = smblib_get_usb_suspend(chg, &val->intval);
break; break;
case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMITED: case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMITED:
if (chip->dt.pl_mode == POWER_SUPPLY_PL_USBIN_USBIN) if ((chip->dt.pl_mode == POWER_SUPPLY_PL_USBIN_USBIN)
|| (chip->dt.pl_mode == POWER_SUPPLY_PL_USBIN_USBIN_EXT))
rc = smblib_get_prop_input_current_limited(chg, val); rc = smblib_get_prop_input_current_limited(chg, val);
else else
val->intval = 0; val->intval = 0;
break; break;
case POWER_SUPPLY_PROP_CURRENT_MAX: case POWER_SUPPLY_PROP_CURRENT_MAX:
if (chip->dt.pl_mode == POWER_SUPPLY_PL_USBIN_USBIN) if ((chip->dt.pl_mode == POWER_SUPPLY_PL_USBIN_USBIN)
|| (chip->dt.pl_mode == POWER_SUPPLY_PL_USBIN_USBIN_EXT))
rc = smblib_get_charge_param(chg, &chg->param.usb_icl, rc = smblib_get_charge_param(chg, &chg->param.usb_icl,
&val->intval); &val->intval);
else else
@ -669,7 +671,8 @@ static int smb138x_parallel_set_prop(struct power_supply *psy,
rc = smb138x_set_parallel_suspend(chip, (bool)val->intval); rc = smb138x_set_parallel_suspend(chip, (bool)val->intval);
break; break;
case POWER_SUPPLY_PROP_CURRENT_MAX: case POWER_SUPPLY_PROP_CURRENT_MAX:
if (chip->dt.pl_mode == POWER_SUPPLY_PL_USBIN_USBIN) if ((chip->dt.pl_mode == POWER_SUPPLY_PL_USBIN_USBIN)
|| (chip->dt.pl_mode == POWER_SUPPLY_PL_USBIN_USBIN_EXT))
rc = smblib_set_charge_param(chg, &chg->param.usb_icl, rc = smblib_set_charge_param(chg, &chg->param.usb_icl,
val->intval); val->intval);
break; break;
@ -1484,7 +1487,8 @@ static int smb138x_slave_probe(struct smb138x *chip)
goto cleanup; goto cleanup;
} }
if (chip->dt.pl_mode == POWER_SUPPLY_PL_USBIN_USBIN) { if ((chip->dt.pl_mode == POWER_SUPPLY_PL_USBIN_USBIN)
|| (chip->dt.pl_mode == POWER_SUPPLY_PL_USBIN_USBIN_EXT)) {
rc = smb138x_init_vbus_regulator(chip); rc = smb138x_init_vbus_regulator(chip);
if (rc < 0) { if (rc < 0) {
pr_err("Couldn't initialize vbus regulator rc=%d\n", pr_err("Couldn't initialize vbus regulator rc=%d\n",