3 files changed, 7 insertions, 0 deletions

diff --git a/Documentation/power/power_supply_class.txt b/Documentation/power/power_supply_class.txt
index 9c647bd7c5a9..3f10b39b0346 100644
--- a/Documentation/power/power_supply_class.txt
+++ b/Documentation/power/power_supply_class.txt
@@ -123,6 +123,9 @@ CONSTANT_CHARGE_VOLTAGE - constant charge voltage programmed by charger.
 CONSTANT_CHARGE_VOLTAGE_MAX - maximum charge voltage supported by the
 power supply object.
 
+CHARGE_CONTROL_LIMIT - current charge control limit setting
+CHARGE_CONTROL_LIMIT_MAX - maximum charge control limit setting
+
 ENERGY_FULL, ENERGY_EMPTY - same as above but for energy.
 
 CAPACITY - capacity in percents.
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 395c2cfa16c0..40fa3b7cae54 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -164,6 +164,8 @@ static struct device_attribute power_supply_attrs[] = {
         POWER_SUPPLY_ATTR(constant_charge_current_max),
         POWER_SUPPLY_ATTR(constant_charge_voltage),
         POWER_SUPPLY_ATTR(constant_charge_voltage_max),
+        POWER_SUPPLY_ATTR(charge_control_limit),
+        POWER_SUPPLY_ATTR(charge_control_limit_max),
         POWER_SUPPLY_ATTR(energy_full_design),
         POWER_SUPPLY_ATTR(energy_empty_design),
         POWER_SUPPLY_ATTR(energy_full),
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index e5ef45834c3c..445b4b249af5 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -114,6 +114,8 @@ enum power_supply_property {
         POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX,
         POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE,
         POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX,
+        POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT,
+        POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX,
         POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
         POWER_SUPPLY_PROP_ENERGY_EMPTY_DESIGN,
         POWER_SUPPLY_PROP_ENERGY_FULL,