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

Merge "qcom-charger: smb138x: Add MODEL_NAME property for parallel"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-21 05:01:26 -08:00 • committed by Gerrit - the friendly Code Review server
commit a991f5b51e
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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 * 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 * 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_CURRENT_NOW,
POWER_SUPPLY_PROP_CHARGER_TEMP, POWER_SUPPLY_PROP_CHARGER_TEMP,
POWER_SUPPLY_PROP_CHARGER_TEMP_MAX, POWER_SUPPLY_PROP_CHARGER_TEMP_MAX,
POWER_SUPPLY_PROP_MODEL_NAME,
}; };
static int smb138x_parallel_get_prop(struct power_supply *psy, 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: case POWER_SUPPLY_PROP_CHARGER_TEMP_MAX:
rc = smblib_get_prop_charger_temp_max(chg, val); rc = smblib_get_prop_charger_temp_max(chg, val);
break; break;
case POWER_SUPPLY_PROP_MODEL_NAME:
val->strval = "smb138x";
break;
default: default:
pr_err("parallel power supply get prop %d not supported\n", pr_err("parallel power supply get prop %d not supported\n",
prop); prop);