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

Commit c23c3c3c authored by Robert Baldyga's avatar Robert Baldyga Committed by Felipe Balbi
Browse files

usb: gadget: net2280: add ep capabilities support 



Convert endpoint configuration to new capabilities model.

Signed-off-by: default avatarRobert Baldyga <r.baldyga@samsung.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent f95aec51

drivers/usb/gadget/udc/net2280.c

+55 −12
Original line number Original line Diff line number Diff line
@@ -74,19 +74,58 @@ static const char driver_desc[] = DRIVER_DESC; 




static const u32 ep_bit[9] = { 0, 17, 2, 19, 4, 1, 18, 3, 20 };

static const u32 ep_bit[9] = { 0, 17, 2, 19, 4, 1, 18, 3, 20 };

static const char ep0name[] = "ep0";

static const char ep0name[] = "ep0";

static const char *const ep_name[] = {

	ep0name,

	"ep-a", "ep-b", "ep-c", "ep-d",

	"ep-e", "ep-f", "ep-g", "ep-h",

};





/* Endpoint names for usb3380 advance mode */

#define EP_INFO(_name, _caps) \

static const char *const ep_name_adv[] = {

	{ \

	ep0name,

		.name = _name, \

	"ep1in", "ep2out", "ep3in", "ep4out",

		.caps = _caps, \

	"ep1out", "ep2in", "ep3out", "ep4in",

	}



static const struct {

	const char *name;

	const struct usb_ep_caps caps;

} ep_info_dft[] = { /* Default endpoint configuration */

	EP_INFO(ep0name,

		USB_EP_CAPS(USB_EP_CAPS_TYPE_CONTROL, USB_EP_CAPS_DIR_ALL)),

	EP_INFO("ep-a",

		USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_ALL)),

	EP_INFO("ep-b",

		USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_ALL)),

	EP_INFO("ep-c",

		USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_ALL)),

	EP_INFO("ep-d",

		USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_ALL)),

	EP_INFO("ep-e",

		USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_ALL)),

	EP_INFO("ep-f",

		USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_ALL)),

	EP_INFO("ep-g",

		USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_ALL)),

	EP_INFO("ep-h",

		USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_ALL)),

}, ep_info_adv[] = { /* Endpoints for usb3380 advance mode */

	EP_INFO(ep0name,

		USB_EP_CAPS(USB_EP_CAPS_TYPE_CONTROL, USB_EP_CAPS_DIR_ALL)),

	EP_INFO("ep1in",

		USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_IN)),

	EP_INFO("ep2out",

		USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_OUT)),

	EP_INFO("ep3in",

		USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_IN)),

	EP_INFO("ep4out",

		USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_OUT)),

	EP_INFO("ep1out",

		USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_OUT)),

	EP_INFO("ep2in",

		USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_IN)),

	EP_INFO("ep3out",

		USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_OUT)),

	EP_INFO("ep4in",

		USB_EP_CAPS(USB_EP_CAPS_TYPE_ALL, USB_EP_CAPS_DIR_IN)),

};

};





#undef EP_INFO



/* mode 0 == ep-{a,b,c,d} 1K fifo each

/* mode 0 == ep-{a,b,c,d} 1K fifo each

 * mode 1 == ep-{a,b} 2K fifo each, ep-{c,d} unavailable

 * mode 1 == ep-{a,b} 2K fifo each, ep-{c,d} unavailable

 * mode 2 == ep-a 2K fifo, ep-{b,c} 1K each, ep-d unavailable

 * mode 2 == ep-a 2K fifo, ep-{b,c} 1K each, ep-d unavailable
@@ -2055,7 +2094,8 @@ static void usb_reinit_228x(struct net2280 *dev) 
	for (tmp = 0; tmp < 7; tmp++) {

	for (tmp = 0; tmp < 7; tmp++) {

		struct net2280_ep	*ep = &dev->ep[tmp];

		struct net2280_ep	*ep = &dev->ep[tmp];





		ep->ep.name = ep_name[tmp];

		ep->ep.name = ep_info_dft[tmp].name;

		ep->ep.caps = ep_info_dft[tmp].caps;

		ep->dev = dev;

		ep->dev = dev;

		ep->num = tmp;

		ep->num = tmp;
@@ -2095,7 +2135,10 @@ static void usb_reinit_338x(struct net2280 *dev) 
	for (i = 0; i < dev->n_ep; i++) {

	for (i = 0; i < dev->n_ep; i++) {

		struct net2280_ep *ep = &dev->ep[i];

		struct net2280_ep *ep = &dev->ep[i];





		ep->ep.name = dev->enhanced_mode ? ep_name_adv[i] : ep_name[i];

		ep->ep.name = dev->enhanced_mode ? ep_info_adv[i].name :

						   ep_info_dft[i].name;

		ep->ep.caps = dev->enhanced_mode ? ep_info_adv[i].caps :

						   ep_info_dft[i].caps;

		ep->dev = dev;

		ep->dev = dev;

		ep->num = i;

		ep->num = i;