From patchwork Wed Jul 8 11:08:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Baldyga X-Patchwork-Id: 6746051 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9F7219F2F0 for ; Wed, 8 Jul 2015 11:24:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C574E206F0 for ; Wed, 8 Jul 2015 11:24:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C897204FC for ; Wed, 8 Jul 2015 11:24:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934039AbbGHLLD (ORCPT ); Wed, 8 Jul 2015 07:11:03 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:58084 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964889AbbGHLK4 (ORCPT ); Wed, 8 Jul 2015 07:10:56 -0400 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NR601H4V1Q57PB0@mailout2.samsung.com>; Wed, 08 Jul 2015 20:10:53 +0900 (KST) X-AuditID: cbfee61b-f79416d0000014c0-70-559d053d1e80 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id D8.B5.05312.D350D955; Wed, 8 Jul 2015 20:10:53 +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:10:53 +0900 (KST) From: Robert Baldyga To: gregkh@linuxfoundation.org Cc: Peter.Chen@freescale.com, johnyoun@synopsys.com, balbi@ti.com, dahlmann.thomas@arcor.de, nicolas.ferre@atmel.com, cernekee@gmail.com, leoli@freescale.com, daniel@zonque.org, haojian.zhuang@gmail.com, robert.jarzmik@free.fr, michal.simek@xilinx.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, linux-omap@vger.kernel.org, linux-geode@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, andrzej.p@samsung.com, m.szyprowski@samsung.com, Robert Baldyga Subject: [PATCH 09/37] usb: gadget: at91_udc: add ep capabilities support Date: Wed, 08 Jul 2015 13:08:53 +0200 Message-id: <1436353761-7107-10-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+NgFuphkeLIzCtJLcpLzFFi42I5/e+xoK4t69xQgy//+C1mvWxnsTh4v95i 74K7jBad9w8zWzT9fcVisefML3aL5sXr2SwurDO32H36EqPFrwdCFpseX2O16D93msXi8q45 bBazl/SzWCxa1sps8fv7P1aLtUfuslu8exlh8e1yM7vFsdl/mSweHN7JbjHrjbCDmMfkJxuZ PBb82sricW/fYRaP/nWfWT3+He5n8tg56y67x/65a9g9Ni+p9zg/YyGjR9+WVYweW/Z/ZvQ4 fmM7k8fnTXIeez//ZvHYvns5SwB/FJdNSmpOZllqkb5dAlfGngPtzAWHeSquNU5haWCcwNXF yMkhIWAiMe3MH3YIW0ziwr31bF2MXBxCAtMZJTY9PsQC4fxklOi6vhasik1AR2LL9wmMILaI gJzEk9t/mEGKmAV2s0ic6joJViQs4CnR87eBGcRmEVCVeH3mJJjNK+AqseTNUWaIdXISJ49N ZgWxOYHi1489BosLCbhIfLi+gXkCI+8CRoZVjKKpBckFxUnpuUZ6xYm5xaV56XrJ+bmbGMFx 9Ex6B+OqBotDjAIcjEo8vB8i54QKsSaWFVfmHmKU4GBWEuHddQEoxJuSWFmVWpQfX1Sak1p8 iFGag0VJnPdkvk+okEB6YklqdmpqQWoRTJaJg1OqgVFv5X6+oiesN70DdhVuLbSNdWM4c/x0 2ovQxx5iT4xNCp5Z7txf9ZSNM+ZaYnXb6iV3z8YvyeeYWJF8Jy1B4wn7k/ZDAm93ic9s+jsn XqWizVgr5ofosTxR5pCSJUx8Gj+mtN+Yz21+9s5GRZvza8/lSt4zsQqf97Xqw9zlVTfLbpls 4ZuusUuJpTgj0VCLuag4EQDjWc/knwIAAA== Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Convert endpoint configuration to new capabilities model. Signed-off-by: Robert Baldyga --- drivers/usb/gadget/udc/at91_udc.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/drivers/usb/gadget/udc/at91_udc.c b/drivers/usb/gadget/udc/at91_udc.c index fc42264..a04b073 100644 --- a/drivers/usb/gadget/udc/at91_udc.c +++ b/drivers/usb/gadget/udc/at91_udc.c @@ -59,15 +59,29 @@ #define DRIVER_VERSION "3 May 2006" static const char driver_name [] = "at91_udc"; -static const char * const ep_names[] = { - "ep0", - "ep1", - "ep2", - "ep3-int", - "ep4", - "ep5", + +static const struct { + const char *name; + const struct usb_ep_caps caps; +} 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("ep0", CONTROL, ALL), + EP_INFO("ep1", ALL, ALL), + EP_INFO("ep2", ALL, ALL), + EP_INFO("ep3-int", INT, ALL), + EP_INFO("ep4", ALL, ALL), + EP_INFO("ep5", ALL, ALL), + +#undef EP_INFO }; -#define ep0name ep_names[0] + +#define ep0name ep_info[0].name #define VBUS_POLL_TIMEOUT msecs_to_jiffies(1000) @@ -1830,7 +1844,8 @@ static int at91udc_probe(struct platform_device *pdev) for (i = 0; i < NUM_ENDPOINTS; i++) { ep = &udc->ep[i]; - ep->ep.name = ep_names[i]; + ep->ep.name = ep_info[i].name; + ep->ep.caps = ep_info[i].caps; ep->ep.ops = &at91_ep_ops; ep->udc = udc; ep->int_mask = BIT(i);