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

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

Merge "usb: dwc3: gadget: Let GSI ep ops allocate TRBs for GSI eps"

parents 8b1fd0f3 d834c953

drivers/usb/dwc3/gadget.c

+4 −1
Original line number Diff line number Diff line
@@ -2634,7 +2634,6 @@ static const struct usb_gadget_ops dwc3_gadget_ops = { 
#define NUM_GSI_OUT_EPS	1

#define NUM_GSI_IN_EPS	2





static int dwc3_gadget_init_control_endpoint(struct dwc3_ep *dep)

{

	struct dwc3 *dwc = dep->dwc;
@@ -2739,12 +2738,16 @@ static int dwc3_gadget_init_endpoints(struct dwc3 *dwc, u8 total) 
		/* Reserve EPs at the end for GSI */

		if (!dep->direction && num >

				out_count - NUM_GSI_OUT_EPS - 1) {

			/* Allocation of TRBs are handled by GSI EP ops. */

			dwc3_free_trb_pool(dep);

			idx = num - (out_count - NUM_GSI_OUT_EPS - 1);

			snprintf(dep->name, sizeof(dep->name), "gsi-epout%d",

					idx);

			dep->endpoint.ep_type = EP_TYPE_GSI;

		} else if (dep->direction && num >

				in_count - NUM_GSI_IN_EPS - 1) {

			/* Allocation of TRBs are handled by GSI EP ops. */

			dwc3_free_trb_pool(dep);

			idx = num - (in_count - NUM_GSI_IN_EPS - 1);

			snprintf(dep->name, sizeof(dep->name), "gsi-epin%d",

					idx);