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

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

usb: gadget: bcm63xx_udc: 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 b9ed96d7

drivers/usb/gadget/udc/bcm63xx_udc.c

+25 −4
Original line number Diff line number Diff line
@@ -44,9 +44,29 @@ 
#define DRV_MODULE_NAME		"bcm63xx_udc"



static const char bcm63xx_ep0name[] = "ep0";

static const char *const bcm63xx_ep_name[] = {

	bcm63xx_ep0name,

	"ep1in-bulk", "ep2out-bulk", "ep3in-int", "ep4out-int",



static const struct {

	const char *name;

	const struct usb_ep_caps caps;

} bcm63xx_ep_info[] = {

#define EP_INFO(_name, _caps) \

	{ \

		.name = _name, \

		.caps = _caps, \

	}



	EP_INFO(bcm63xx_ep0name,

		USB_EP_CAPS(USB_EP_CAPS_TYPE_CONTROL, USB_EP_CAPS_DIR_ALL)),

	EP_INFO("ep1in-bulk",

		USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK, USB_EP_CAPS_DIR_IN)),

	EP_INFO("ep2out-bulk",

		USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK, USB_EP_CAPS_DIR_OUT)),

	EP_INFO("ep3in-int",

		USB_EP_CAPS(USB_EP_CAPS_TYPE_INT, USB_EP_CAPS_DIR_IN)),

	EP_INFO("ep4out-int",

		USB_EP_CAPS(USB_EP_CAPS_TYPE_INT, USB_EP_CAPS_DIR_OUT)),



#undef EP_INFO

};



static bool use_fullspeed;
@@ -943,7 +963,8 @@ static int bcm63xx_init_udc_hw(struct bcm63xx_udc *udc) 
	for (i = 0; i < BCM63XX_NUM_EP; i++) {

		struct bcm63xx_ep *bep = &udc->bep[i];



		bep->ep.name = bcm63xx_ep_name[i];

		bep->ep.name = bcm63xx_ep_info[i].name;

		bep->ep.caps = bcm63xx_ep_info[i].caps;

		bep->ep_num = i;

		bep->ep.ops = &bcm63xx_udc_ep_ops;

		list_add_tail(&bep->ep.ep_list, &udc->gadget.ep_list);