aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorZiyan <jaraidaniel@gmail.com>2015-01-10 10:45:38 +0100
committerZiyan <jaraidaniel@gmail.com>2015-01-10 10:45:38 +0100
commitc7583ba7c583ed7623c526b16d29ce1c8b717efa (patch)
tree535f88c05d65c42e2778d9b12f80849ea0f9ca29 /drivers/power
parent8bb843b825d1f0fd04779d32edae3a534a9365f4 (diff)
downloadkernel_samsung_tuna-c7583ba7c583ed7623c526b16d29ce1c8b717efa.zip
kernel_samsung_tuna-c7583ba7c583ed7623c526b16d29ce1c8b717efa.tar.gz
kernel_samsung_tuna-c7583ba7c583ed7623c526b16d29ce1c8b717efa.tar.bz2
power: max17040: add support for POWER_SUPPLY_PROP_CHARGE_ENABLED
Change-Id: Ied641d29a7258a069811e51383cdbf7be06bc0e7
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/max17040_battery.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/power/max17040_battery.c b/drivers/power/max17040_battery.c
index 2b6b131..b4161ce 100644
--- a/drivers/power/max17040_battery.c
+++ b/drivers/power/max17040_battery.c
@@ -119,6 +119,9 @@ static int max17040_get_property(struct power_supply *psy,
case POWER_SUPPLY_PROP_TECHNOLOGY:
val->intval = POWER_SUPPLY_TECHNOLOGY_LION;
break;
+ case POWER_SUPPLY_PROP_CHARGE_ENABLED:
+ val->intval = chip->pdata->charger_enable();
+ break;
default:
return -EINVAL;
}
@@ -437,6 +440,7 @@ static enum power_supply_property max17040_battery_props[] = {
POWER_SUPPLY_PROP_VOLTAGE_NOW,
POWER_SUPPLY_PROP_CAPACITY,
POWER_SUPPLY_PROP_TECHNOLOGY,
+ POWER_SUPPLY_PROP_CHARGE_ENABLED,
/* must be last */
POWER_SUPPLY_PROP_TEMP,
};