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

Merge "qcom: smb138x-charger: support two usb input properties"

Browse source
This commit is contained in:
Linux Build Service Account 2017-03-30 15:31:24 -07:00 • committed by Gerrit - the friendly Code Review server
commit 2b504b9bae
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -535,6 +535,8 @@ static enum power_supply_property smb138x_parallel_props[] = {
POWER_SUPPLY_PROP_CHARGING_ENABLED, POWER_SUPPLY_PROP_CHARGING_ENABLED,
POWER_SUPPLY_PROP_PIN_ENABLED, POWER_SUPPLY_PROP_PIN_ENABLED,
POWER_SUPPLY_PROP_INPUT_SUSPEND, POWER_SUPPLY_PROP_INPUT_SUSPEND,
POWER_SUPPLY_PROP_INPUT_CURRENT_LIMITED,
POWER_SUPPLY_PROP_CURRENT_MAX,
POWER_SUPPLY_PROP_VOLTAGE_MAX, POWER_SUPPLY_PROP_VOLTAGE_MAX,
POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX,
POWER_SUPPLY_PROP_CURRENT_NOW, POWER_SUPPLY_PROP_CURRENT_NOW,
@ -574,6 +576,19 @@ static int smb138x_parallel_get_prop(struct power_supply *psy,
case POWER_SUPPLY_PROP_INPUT_SUSPEND: case POWER_SUPPLY_PROP_INPUT_SUSPEND:
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:
if (chip->dt.pl_mode == POWER_SUPPLY_PL_USBIN_USBIN)
rc = smblib_get_prop_input_current_limited(chg, val);
else
val->intval = 0;
break;
case POWER_SUPPLY_PROP_CURRENT_MAX:
if (chip->dt.pl_mode == POWER_SUPPLY_PL_USBIN_USBIN)
rc = smblib_get_charge_param(chg, &chg->param.usb_icl,
&val->intval);
else
val->intval = 0;
break;
case POWER_SUPPLY_PROP_VOLTAGE_MAX: case POWER_SUPPLY_PROP_VOLTAGE_MAX:
rc = smblib_get_charge_param(chg, &chg->param.fv, &val->intval); rc = smblib_get_charge_param(chg, &chg->param.fv, &val->intval);
break; break;
@ -653,6 +668,11 @@ static int smb138x_parallel_set_prop(struct power_supply *psy,
case POWER_SUPPLY_PROP_INPUT_SUSPEND: case POWER_SUPPLY_PROP_INPUT_SUSPEND:
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:
if (chip->dt.pl_mode == POWER_SUPPLY_PL_USBIN_USBIN)
rc = smblib_set_charge_param(chg, &chg->param.usb_icl,
val->intval);
break;
case POWER_SUPPLY_PROP_VOLTAGE_MAX: case POWER_SUPPLY_PROP_VOLTAGE_MAX:
rc = smblib_set_charge_param(chg, &chg->param.fv, val->intval); rc = smblib_set_charge_param(chg, &chg->param.fv, val->intval);
break; break;