diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-21 05:01:26 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-21 05:01:26 -0800 |
| commit | a991f5b51e0d95860294ab3acc4ce42f4e73386f (patch) | |
| tree | de1b75008f929e3e2fa479e6ecbaccad425b31e7 /drivers | |
| parent | 79ef6a4e903e4e3405ba59c732d7f5250829f3f2 (diff) | |
| parent | c9f6c20965e14ace70525132e5799f0fd12a9f03 (diff) | |
Merge "qcom-charger: smb138x: Add MODEL_NAME property for parallel"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/supply/qcom/smb138x-charger.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/power/supply/qcom/smb138x-charger.c b/drivers/power/supply/qcom/smb138x-charger.c index 70d935e9d1df..ed76a585ed03 100644 --- a/drivers/power/supply/qcom/smb138x-charger.c +++ b/drivers/power/supply/qcom/smb138x-charger.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016 The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -410,6 +410,7 @@ static enum power_supply_property smb138x_parallel_props[] = { POWER_SUPPLY_PROP_CURRENT_NOW, POWER_SUPPLY_PROP_CHARGER_TEMP, POWER_SUPPLY_PROP_CHARGER_TEMP_MAX, + POWER_SUPPLY_PROP_MODEL_NAME, }; static int smb138x_parallel_get_prop(struct power_supply *psy, @@ -456,6 +457,9 @@ static int smb138x_parallel_get_prop(struct power_supply *psy, case POWER_SUPPLY_PROP_CHARGER_TEMP_MAX: rc = smblib_get_prop_charger_temp_max(chg, val); break; + case POWER_SUPPLY_PROP_MODEL_NAME: + val->strval = "smb138x"; + break; default: pr_err("parallel power supply get prop %d not supported\n", prop); |