From e531c03040b9ad3a86d3b751fb47b3362d85f373 Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Thu, 19 Sep 2013 18:35:39 +0100 Subject: Revert "max77693: Standardize the output of the "online" property" This reverts commit 1a05356029493b29f866cf04f7550243ef3ae687, the enumerator breakage introduced by change Iafbd9fb45253b02d539ac0ba114f57b3bf9eeed4 can be reverted cleanly without further impact and it's a cleaner fix Change-Id: I351c320f98691241fbe321a0b1ac54152802deb4 --- include/linux/power_supply.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include/linux/power_supply.h') diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 566002b..529d981 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -129,8 +129,7 @@ enum power_supply_property { }; enum power_supply_type { - POWER_SUPPLY_TYPE_UNKNOWN = 0, - POWER_SUPPLY_TYPE_BATTERY, + POWER_SUPPLY_TYPE_BATTERY = 0, POWER_SUPPLY_TYPE_UPS, POWER_SUPPLY_TYPE_MAINS, POWER_SUPPLY_TYPE_USB, /* Standard Downstream Port */ -- cgit v1.1 From 7fc3ce7312fec9320aeffb1a6c6c6d4bf2408669 Mon Sep 17 00:00:00 2001 From: sbrissen Date: Wed, 23 Oct 2013 13:19:08 -0400 Subject: Add support for Note 8 (N5100 and N5110) Change-Id: I6c9798682f9f6349b37cb452353bd0c0e6958401 --- include/linux/power_supply.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/linux/power_supply.h') diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 529d981..8289fca 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -126,6 +126,11 @@ enum power_supply_property { POWER_SUPPLY_PROP_MODEL_NAME, POWER_SUPPLY_PROP_MANUFACTURER, POWER_SUPPLY_PROP_SERIAL_NUMBER, +#if defined(CONFIG_MACH_KONA) + POWER_SUPPLY_PROP_CHARGING_MODE, + POWER_SUPPLY_PROP_COMPENSATION_1, + POWER_SUPPLY_PROP_COMPENSATION_3, +#endif }; enum power_supply_type { -- cgit v1.1