From patchwork Wed Jul 8 11:08:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Baldyga X-Patchwork-Id: 492917 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AA8CD1402BB for ; Wed, 8 Jul 2015 23:08:13 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 8F7981A3A28 for ; Wed, 8 Jul 2015 23:08:13 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 5E8261A18B0 for ; Wed, 8 Jul 2015 21:21:04 +1000 (AEST) Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NR602P3E1QDQR40@mailout3.samsung.com> for linuxppc-dev@lists.ozlabs.org; Wed, 08 Jul 2015 20:11:01 +0900 (KST) X-AuditID: cbfee61a-f79516d000006302-46-559d05447235 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id AF.6D.25346.4450D955; Wed, 8 Jul 2015 20:11:01 +0900 (KST) Received: from AMDC2122.DIGITAL.local ([106.120.53.17]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NR6001FW1NOWRB0@mmp2.samsung.com>; Wed, 08 Jul 2015 20:11:00 +0900 (KST) From: Robert Baldyga To: gregkh@linuxfoundation.org Subject: [PATCH 10/37] usb: gadget: bcm63xx_udc: add ep capabilities support Date: Wed, 08 Jul 2015 13:08:54 +0200 Message-id: <1436353761-7107-11-git-send-email-r.baldyga@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1436353761-7107-1-git-send-email-r.baldyga@samsung.com> References: <1436353761-7107-1-git-send-email-r.baldyga@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmkeLIzCtJLcpLzFFi42I5/e+xoK4r69xQg+W7eCxmvWxnsTh4v95i 74K7jBad9w8zWzT9fcVisefML3aL5sXr2SwurDO32H36EqPFrwdCFpseX2O16D93msXi8q45 bBazl/SzWCxa1sps8fv7P1aLtUfuslu8exlh8e1yM7vFsdl/mSweHN7JbjHrjbCDmMfkJxuZ PBb82sricW/fYRaP/nWfWT3+He5n8tg56y67x/65a9g9Ni+p9zg/YyGjR9+WVYweW/Z/ZvQ4 fmM7k8fnTXIeez//ZvHYvns5SwB/FJdNSmpOZllqkb5dAlfGv5YupoJHPBUNmy+wNzBe5upi 5OSQEDCReL57FTOELSZx4d56NhBbSGA6o8S8bZ5djFxA9k9Gib07ZrOCJNgEdCS2fJ/ACGKL CMhJPLn9hxmkiFlgN4vEqa6T7CAJYQEfiRPzIBpYBFQlHp+YAGbzCrhKrHnUxwKxTU7i5LHJ YHFOoPj1Y4+ZITa7SHy4voF5AiPvAkaGVYyiqQXJBcVJ6bmGesWJucWleel6yfm5mxjBUfRM agfjygaLQ4wCHIxKPLwfI+eECrEmlhVX5h5ilOBgVhLhnccyN1SINyWxsiq1KD++qDQntfgQ ozQHi5I478l8n1AhgfTEktTs1NSC1CKYLBMHp1QD4zF/d10Xn+nF71/pHlvx99VFW4fChB2+ okuZU1zOth0T3nHa7HH3klunnszr0Rf58Tjv6J8rLStMJB7eNPtivPZk4I8097S9yR6friQ6 eKxdb3Ut1vy6VsSflx2+29g0d7y4+d+2I4O5eVlkffar39knPx+btfbmEaOLztKeUs/PsZw9 en5ey1UlluKMREMt5qLiRAAXdw3wngIAAA== X-Mailman-Approved-At: Wed, 08 Jul 2015 22:44:56 +1000 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, linux-usb@vger.kernel.org, m.szyprowski@samsung.com, linux-arm-kernel@lists.infradead.org, johnyoun@synopsys.com, linuxppc-dev@lists.ozlabs.org, cernekee@gmail.com, nicolas.ferre@atmel.com, michal.simek@xilinx.com, balbi@ti.com, linux-kernel@vger.kernel.org, haojian.zhuang@gmail.com, linux-omap@vger.kernel.org, Robert Baldyga , Peter.Chen@freescale.com, dahlmann.thomas@arcor.de, andrzej.p@samsung.com, robert.jarzmik@free.fr, daniel@zonque.org, linux-geode@lists.infradead.org MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Convert endpoint configuration to new capabilities model. Signed-off-by: Robert Baldyga --- drivers/usb/gadget/udc/bcm63xx_udc.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/drivers/usb/gadget/udc/bcm63xx_udc.c b/drivers/usb/gadget/udc/bcm63xx_udc.c index 9db968b..c5e0894 100644 --- a/drivers/usb/gadget/udc/bcm63xx_udc.c +++ b/drivers/usb/gadget/udc/bcm63xx_udc.c @@ -44,9 +44,25 @@ #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, _type, _dir) \ + { \ + .name = _name, \ + .caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_ ## _type, \ + USB_EP_CAPS_DIR_ ## _dir), \ + } + + EP_INFO(bcm63xx_ep0name, CONTROL, ALL), + EP_INFO("ep1in-bulk", BULK, IN), + EP_INFO("ep2out-bulk", BULK, OUT), + EP_INFO("ep3in-int", INT, IN), + EP_INFO("ep4out-int", INT, OUT), + +#undef EP_INFO }; static bool use_fullspeed; @@ -943,7 +959,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);