From 913ef3015327ec06b50ea1410492a7130bb9c213 Mon Sep 17 00:00:00 2001 From: Umang Agrawal Date: Thu, 21 Feb 2019 10:39:42 +0530 Subject: [PATCH] ANDROID: GKI: power_supply: Add VOLTAGE_MAX_LIMIT power supply property Add power supply property VOLTAGE_MAX_LIMIT in usb_psy to allow external entities to impose limitation on the maximum USB adapter output voltage. Signed-off-by: Umang Agrawal Signed-off-by: Guru Das Srinagesh (cherry picked from commit e0219228eed9c1a3a79dc10ec7257a375560c396) Signed-off-by: Mark Salyzyn Bug: 150789066 Change-Id: I3d05188f11ccd0c47cfca626e528bbe2e30582ae --- drivers/power/supply/power_supply_sysfs.c | 1 + include/linux/power_supply.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c index 8a4d97b657f4..b6f790055ed9 100644 --- a/drivers/power/supply/power_supply_sysfs.c +++ b/drivers/power/supply/power_supply_sysfs.c @@ -456,6 +456,7 @@ static struct device_attribute power_supply_attrs[] = { POWER_SUPPLY_ATTR(chip_version), POWER_SUPPLY_ATTR(therm_icl_limit), POWER_SUPPLY_ATTR(dc_reset), + POWER_SUPPLY_ATTR(voltage_max_limit), /* Charge pump properties */ POWER_SUPPLY_ATTR(cp_status1), POWER_SUPPLY_ATTR(cp_status2), diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 41f591837ef6..08f543526068 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -328,6 +328,7 @@ enum power_supply_property { POWER_SUPPLY_PROP_CHIP_VERSION, POWER_SUPPLY_PROP_THERM_ICL_LIMIT, POWER_SUPPLY_PROP_DC_RESET, + POWER_SUPPLY_PROP_VOLTAGE_MAX_LIMIT, /* Charge pump properties */ POWER_SUPPLY_PROP_CP_STATUS1, POWER_SUPPLY_PROP_CP_STATUS2,