Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad91fff0 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "FROMLIST: power_supply: Add additional health properties to the header"

parents 851105a7 58716e7b

Documentation/ABI/testing/sysfs-class-power

+2 −1
Original line number Diff line number Diff line
@@ -189,7 +189,8 @@ Description: 
		Access: Read

		Valid values: "Unknown", "Good", "Overheat", "Dead",

			      "Over voltage", "Unspecified failure", "Cold",

			      "Watchdog timer expire", "Safety timer expire"

			      "Watchdog timer expire", "Safety timer expire",

			      "Over current", "Warm", "Cool", "Hot"



What:		/sys/class/power_supply/<supply_name>/precharge_current

Date:		June 2017

drivers/power/supply/power_supply_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static const char * const power_supply_charge_type_text[] = { 
static const char * const power_supply_health_text[] = {

	"Unknown", "Good", "Overheat", "Dead", "Over voltage",

	"Unspecified failure", "Cold", "Watchdog timer expire",

	"Safety timer expire", "Over current"

	"Safety timer expire", "Over current", "Warm", "Cool", "Hot"

};



static const char * const power_supply_technology_text[] = {

include/linux/power_supply.h

+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ enum { 
	POWER_SUPPLY_HEALTH_WATCHDOG_TIMER_EXPIRE,

	POWER_SUPPLY_HEALTH_SAFETY_TIMER_EXPIRE,

	POWER_SUPPLY_HEALTH_OVERCURRENT,

	POWER_SUPPLY_HEALTH_WARM,

	POWER_SUPPLY_HEALTH_COOL,

	POWER_SUPPLY_HEALTH_HOT,

};



enum {