summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Troast <ntroast@codeaurora.org>2016-10-06 11:48:31 -0700
committerNicholas Troast <ntroast@codeaurora.org>2016-10-10 16:27:06 -0700
commit5b0ad6818af4daa42bdfbf9fb3ecefb38cca138c (patch)
treef08cb32f3f45cc5ff17ec7f49e7c0def0b0da26a
parentf79b613e2ddff638e10e28dd8f41ff9412369dda (diff)
power_supply: add PARALLEL_DISABLE property
The PARALLEL_DISABLE property is used to enable or disable parallel charging. Change-Id: If2845efa942abc5849890b45de525222632b32db Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
-rw-r--r--drivers/power/power_supply_sysfs.c1
-rw-r--r--include/linux/power_supply.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 545a1e684b25..8af1eb66c699 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -269,6 +269,7 @@ static struct device_attribute power_supply_attrs[] = {
POWER_SUPPLY_ATTR(pd_active),
POWER_SUPPLY_ATTR(charger_temp),
POWER_SUPPLY_ATTR(charger_temp_max),
+ POWER_SUPPLY_ATTR(parallel_disable),
/* Local extensions of type int64_t */
POWER_SUPPLY_ATTR(charge_counter_ext),
/* Properties of type `const char *' */
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 03853d956b41..c477f60c3f01 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -218,6 +218,7 @@ enum power_supply_property {
POWER_SUPPLY_PROP_PD_ACTIVE,
POWER_SUPPLY_PROP_CHARGER_TEMP,
POWER_SUPPLY_PROP_CHARGER_TEMP_MAX,
+ POWER_SUPPLY_PROP_PARALLEL_DISABLE,
/* Local extensions of type int64_t */
POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,
/* Properties of type `const char *' */