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

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

Merge "power_supply: Add additional USB PD properties"

parents c8c3a402 9ed824e1

Documentation/devicetree/bindings/usb/qpnp-pdphy.txt

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ Optional properties: 
- vconn-supply:		Regulator that enables VCONN source output. This will

			be supplied on the USB CC line that is not used for

			communication when Ra resistance is detected.

- qcom,vconn-uses-external-source: Indicates whether VCONN supply is sourced

			from an external regulator. If omitted, then it is

			assumed it is connected to VBUS.



Example:

	qcom,qpnp-pdphy@1700 {

drivers/power/power_supply_sysfs.c

+3 −0
Original line number Diff line number Diff line
@@ -267,6 +267,9 @@ static struct device_attribute power_supply_attrs[] = { 
	POWER_SUPPLY_ATTR(typec_power_role),

	POWER_SUPPLY_ATTR(pd_allowed),

	POWER_SUPPLY_ATTR(pd_active),

	POWER_SUPPLY_ATTR(pd_in_hard_reset),

	POWER_SUPPLY_ATTR(pd_current_max),

	POWER_SUPPLY_ATTR(pd_usb_suspend_supported),

	POWER_SUPPLY_ATTR(charger_temp),

	POWER_SUPPLY_ATTR(charger_temp_max),

	POWER_SUPPLY_ATTR(parallel_disable),

drivers/usb/pd/policy_engine.c

+291 −107

File changed.

Preview size limit exceeded, changes collapsed.

include/linux/power_supply.h

+3 −0
Original line number Diff line number Diff line
@@ -216,6 +216,9 @@ enum power_supply_property { 
	POWER_SUPPLY_PROP_TYPEC_POWER_ROLE,

	POWER_SUPPLY_PROP_PD_ALLOWED,

	POWER_SUPPLY_PROP_PD_ACTIVE,

	POWER_SUPPLY_PROP_PD_IN_HARD_RESET,

	POWER_SUPPLY_PROP_PD_CURRENT_MAX,

	POWER_SUPPLY_PROP_PD_USB_SUSPEND_SUPPORTED,

	POWER_SUPPLY_PROP_CHARGER_TEMP,

	POWER_SUPPLY_PROP_CHARGER_TEMP_MAX,

	POWER_SUPPLY_PROP_PARALLEL_DISABLE,