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

Commit 85efc8a1 authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Anton Vorontsov
Browse files

power_supply: Add types for USB chargers 



This adds power supply types for USB chargers defined in
Battery Charging Specification 1.1.

Signed-off-by: default avatarHeikki Krogerus <ext-heikki.krogerus@nokia.com>
Signed-off-by: default avatarAnton Vorontsov <cbouatmailru@gmail.com>
parent 353f867b

drivers/power/power_supply_sysfs.c

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ static ssize_t power_supply_show_property(struct device *dev, 
					  struct device_attribute *attr,

					  char *buf) {

	static char *type_text[] = {

		"Battery", "UPS", "Mains", "USB"

		"Battery", "UPS", "Mains", "USB",

		"USB_DCP", "USB_CDP", "USB_ACA"

	};

	static char *status_text[] = {

		"Unknown", "Charging", "Discharging", "Not charging", "Full"

include/linux/power_supply.h

+4 −1
Original line number Diff line number Diff line
@@ -125,7 +125,10 @@ enum power_supply_type { 
	POWER_SUPPLY_TYPE_BATTERY = 0,

	POWER_SUPPLY_TYPE_UPS,

	POWER_SUPPLY_TYPE_MAINS,

	POWER_SUPPLY_TYPE_USB,

	POWER_SUPPLY_TYPE_USB,		/* Standard Downstream Port */

	POWER_SUPPLY_TYPE_USB_DCP,	/* Dedicated Charging Port */

	POWER_SUPPLY_TYPE_USB_CDP,	/* Charging Downstream Port */

	POWER_SUPPLY_TYPE_USB_ACA,	/* Accessory Charger Adapters */

};



union power_supply_propval {