diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-12-12 19:00:52 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-12-12 19:00:52 -0800 |
| commit | 2e1be1a230f9282b997959655510a6f905ed17a4 (patch) | |
| tree | f28e66c5e7c38b57561747a0a09851eb8c8f8c3f /drivers | |
| parent | 627a89f9ea63dda84e557774a0fa65e57b9940cb (diff) | |
| parent | 50cd6e03baa2ce1ff0949a9c14ad018e0ec6dfa4 (diff) | |
Merge "smb1351: add MODEL_NAME property in parallel power_supply"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/supply/qcom/smb1351-charger.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/power/supply/qcom/smb1351-charger.c b/drivers/power/supply/qcom/smb1351-charger.c index 2f8833539cb4..ce41ad97bda1 100644 --- a/drivers/power/supply/qcom/smb1351-charger.c +++ b/drivers/power/supply/qcom/smb1351-charger.c @@ -1417,6 +1417,7 @@ static enum power_supply_property smb1351_parallel_properties[] = { POWER_SUPPLY_PROP_CHARGE_TYPE, POWER_SUPPLY_PROP_PARALLEL_MODE, POWER_SUPPLY_PROP_INPUT_SUSPEND, + POWER_SUPPLY_PROP_MODEL_NAME, }; static int smb1351_parallel_set_chg_suspend(struct smb1351_charger *chip, @@ -1711,6 +1712,9 @@ static int smb1351_parallel_get_property(struct power_supply *psy, case POWER_SUPPLY_PROP_INPUT_SUSPEND: val->intval = chip->parallel_charger_suspended; break; + case POWER_SUPPLY_PROP_MODEL_NAME: + val->strval = "smb1351"; + break; default: return -EINVAL; } |