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

Commit a038ce49 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: power_supply: Add USB_PARALLEL charger type"

parents 167a1ce9 07ad8933

drivers/power/power_supply_sysfs.c

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ static ssize_t power_supply_show_property(struct device *dev, 
					  char *buf) {

	static char *type_text[] = {

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

		"USB_DCP", "USB_CDP", "USB_ACA", "Wireless", "BMS"

		"USB_DCP", "USB_CDP", "USB_ACA", "Wireless", "BMS",

		"USB_Parallel"

	};

	static char *status_text[] = {

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

include/linux/power_supply.h

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ enum power_supply_type { 
	POWER_SUPPLY_TYPE_USB_ACA,	/* Accessory Charger Adapters */

	POWER_SUPPLY_TYPE_WIRELESS,	/* Accessory Charger Adapters */

	POWER_SUPPLY_TYPE_BMS,		/* Battery Monitor System */

	POWER_SUPPLY_TYPE_USB_PARALLEL,		/* USB Parallel Path */

};



union power_supply_propval {