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

Commit cea658fb 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_sysfs: Add support for Floating charger"

parents 03a2f767 035edbfe

drivers/power/power_supply_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static ssize_t power_supply_show_property(struct device *dev, 
	static const char * const type_text[] = {

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

		"USB_CDP", "USB_ACA", "USB_HVDCP", "USB_HVDCP_3", "USB_PD",

		"Wireless", "BMS", "Parallel", "Main", "Wipower",

		"Wireless", "USB_FLOAT", "BMS", "Parallel", "Main", "Wipower",

		"TYPEC", "TYPEC_UFP", "TYPEC_DFP"

	};

	static char *status_text[] = {

include/linux/power_supply.h

+1 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ enum power_supply_type { 
	POWER_SUPPLY_TYPE_USB_HVDCP_3,	/* Efficient High Voltage DCP */

	POWER_SUPPLY_TYPE_USB_PD,	/* Power Delivery */

	POWER_SUPPLY_TYPE_WIRELESS,	/* Accessory Charger Adapters */

	POWER_SUPPLY_TYPE_USB_FLOAT,	/* Floating charger */

	POWER_SUPPLY_TYPE_BMS,		/* Battery Monitor System */

	POWER_SUPPLY_TYPE_PARALLEL,	/* Parallel Path */

	POWER_SUPPLY_TYPE_MAIN,		/* Main Path */