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

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

Merge "USB: pd: Notify selfpowered state based on type C current"

parents 05bf56f7 c860b6ac

drivers/usb/dwc3/dwc3-msm.c

+7 −0
Original line number Diff line number Diff line
@@ -2745,6 +2745,13 @@ static void dwc3_resume_work(struct work_struct *w) 
					ORIENTATION_CC2 : ORIENTATION_CC1;



		dbg_event(0xFF, "cc_state", mdwc->typec_orientation);



		ret = extcon_get_property(edev, extcon_id,

				EXTCON_PROP_USB_TYPEC_MED_HIGH_CURRENT, &val);

		if (!ret)

			dwc->gadget.is_selfpowered = val.intval;

		else

			dwc->gadget.is_selfpowered = 0;

	}



	/*

drivers/usb/gadget/composite.c

+4 −0
Original line number Diff line number Diff line
@@ -592,6 +592,10 @@ static int config_buf(struct usb_configuration *config, 
	c->iConfiguration = config->iConfiguration;

	c->bmAttributes = USB_CONFIG_ATT_ONE | config->bmAttributes;

	c->bMaxPower = encode_bMaxPower(speed, config);

	if (config->cdev->gadget->is_selfpowered) {

		c->bmAttributes |= USB_CONFIG_ATT_SELFPOWER;

		c->bMaxPower = 0;

	}



	/* There may be e.g. OTG descriptors */

	if (config->descriptors) {

drivers/usb/pd/policy_engine.c

+6 −0
Original line number Diff line number Diff line
@@ -550,6 +550,10 @@ static inline void start_usb_peripheral(struct usbpd *pd) 
	val.intval = 1;

	extcon_set_property(pd->extcon, EXTCON_USB, EXTCON_PROP_USB_SS, val);



	val.intval = pd->typec_mode > POWER_SUPPLY_TYPEC_SOURCE_DEFAULT ? 1 : 0;

	extcon_set_property(pd->extcon, EXTCON_USB,

			EXTCON_PROP_USB_TYPEC_MED_HIGH_CURRENT, val);



	extcon_set_state_sync(pd->extcon, EXTCON_USB, 1);

}
@@ -4149,6 +4153,8 @@ struct usbpd *usbpd_create(struct device *parent) 
			EXTCON_PROP_USB_TYPEC_POLARITY);

	extcon_set_property_capability(pd->extcon, EXTCON_USB,

			EXTCON_PROP_USB_SS);

	extcon_set_property_capability(pd->extcon, EXTCON_USB,

			EXTCON_PROP_USB_TYPEC_MED_HIGH_CURRENT);

	extcon_set_property_capability(pd->extcon, EXTCON_USB_HOST,

			EXTCON_PROP_USB_TYPEC_POLARITY);

	extcon_set_property_capability(pd->extcon, EXTCON_USB_HOST,

include/linux/extcon.h

+6 −1
Original line number Diff line number Diff line
@@ -124,14 +124,19 @@ 
 * @type:       integer (intval)

 * @value:      0 (USB/USB2) or 1 (USB3)

 * @default:    0 (USB/USB2)

 * - EXTCON_PROP_USB_TYPEC_MED_HIGH_CURRENT

 * @type:       integer (intval)

 * @value:      0 (default current), 1 (medium or high current)

 * @default:    0 (default current)

 *

 */

#define EXTCON_PROP_USB_VBUS		0

#define EXTCON_PROP_USB_TYPEC_POLARITY	1

#define EXTCON_PROP_USB_SS		2

#define EXTCON_PROP_USB_TYPEC_MED_HIGH_CURRENT	3



#define EXTCON_PROP_USB_MIN		0

#define EXTCON_PROP_USB_MAX		2

#define EXTCON_PROP_USB_MAX		3

#define EXTCON_PROP_USB_CNT	(EXTCON_PROP_USB_MAX - EXTCON_PROP_USB_MIN + 1)



/* Properties of EXTCON_TYPE_CHG. */