From patchwork Thu Mar 14 05:50:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Chen X-Patchwork-Id: 2267601 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 5D7D93FC8A for ; Thu, 14 Mar 2013 05:55:26 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UG15E-0001A6-Gk; Thu, 14 Mar 2013 05:52:08 +0000 Received: from mail-db8lp0188.outbound.messaging.microsoft.com ([213.199.154.188] helo=db8outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UG14N-0000uG-Gj for linux-arm-kernel@lists.infradead.org; Thu, 14 Mar 2013 05:51:17 +0000 Received: from mail42-db8-R.bigfish.com (10.174.8.229) by DB8EHSOBE033.bigfish.com (10.174.4.96) with Microsoft SMTP Server id 14.1.225.23; Thu, 14 Mar 2013 05:51:07 +0000 Received: from mail42-db8 (localhost [127.0.0.1]) by mail42-db8-R.bigfish.com (Postfix) with ESMTP id 7450C180124; Thu, 14 Mar 2013 05:51:07 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1f42h1ee6h1de0h1202h1e76h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h1354h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1155h) Received: from mail42-db8 (localhost.localdomain [127.0.0.1]) by mail42-db8 (MessageSwitch) id 1363240265660437_15360; Thu, 14 Mar 2013 05:51:05 +0000 (UTC) Received: from DB8EHSMHS024.bigfish.com (unknown [10.174.8.241]) by mail42-db8.bigfish.com (Postfix) with ESMTP id 9D16E580045; Thu, 14 Mar 2013 05:51:05 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB8EHSMHS024.bigfish.com (10.174.4.34) with Microsoft SMTP Server (TLS) id 14.1.225.23; Thu, 14 Mar 2013 05:51:05 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server (TLS) id 14.2.328.11; Thu, 14 Mar 2013 05:51:03 +0000 Received: from localhost.localdomain (nchen-desktop.ap.freescale.net [10.192.242.40]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r2E5ohlm001281; Wed, 13 Mar 2013 22:50:59 -0700 From: Peter Chen To: Subject: [PATCH 03/14] usb: at91_udc: using common vbus_active Date: Thu, 14 Mar 2013 13:50:31 +0800 Message-ID: <1363240242-25775-4-git-send-email-peter.chen@freescale.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1363240242-25775-1-git-send-email-peter.chen@freescale.com> References: <1363240242-25775-1-git-send-email-peter.chen@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130314_015115_844547_5B3082DF X-CRM114-Status: GOOD ( 12.07 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [213.199.154.188 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: stigge@antcom.de, kgene.kim@samsung.com, eric.y.miao@gmail.com, alexander.shishkin@linux.intel.com, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, haojian.zhuang@gmail.com, chao.xie@marvell.com, ben-linux@fluff.org, yuxu@marvell.com, leoli@freescale.com, plagnioj@jcrosoft.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Using common vbus_active to indicate vbus status CC: Felipe Balbi Signed-off-by: Peter Chen --- drivers/usb/gadget/at91_udc.c | 16 ++++++++-------- drivers/usb/gadget/at91_udc.h | 1 - 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index 45dd292..9508d40 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c @@ -173,9 +173,9 @@ static int proc_udc_show(struct seq_file *s, void *unused) seq_printf(s, "%s: version %s\n", driver_name, DRIVER_VERSION); seq_printf(s, "vbus %s, pullup %s, %s powered%s, gadget %s\n\n", - udc->vbus ? "present" : "off", + udc->gadget.vbus_active ? "present" : "off", udc->enabled - ? (udc->vbus ? "active" : "enabled") + ? (udc->gadget.vbus_active ? "active" : "enabled") : "disabled", udc->selfpowered ? "self" : "VBUS", udc->suspended ? ", suspended" : "", @@ -209,7 +209,7 @@ static int proc_udc_show(struct seq_file *s, void *unused) proc_irq_show(s, "imr ", at91_udp_read(udc, AT91_UDP_IMR)); proc_irq_show(s, "isr ", at91_udp_read(udc, AT91_UDP_ISR)); - if (udc->enabled && udc->vbus) { + if (udc->enabled && udc->gadget.vbus_active) { proc_ep_show(s, &udc->ep[0]); list_for_each_entry (ep, &udc->gadget.ep_list, ep.ep_list) { if (ep->ep.desc) @@ -892,7 +892,7 @@ static void pullup(struct at91_udc *udc, int is_on) { int active = !udc->board.pullup_active_low; - if (!udc->enabled || !udc->vbus) + if (!udc->enabled || !udc->gadget.vbus_active) is_on = 0; DBG("%sactive\n", is_on ? "" : "in"); @@ -944,7 +944,7 @@ static int at91_vbus_session(struct usb_gadget *gadget, int is_active) /* VDBG("vbus %s\n", is_active ? "on" : "off"); */ spin_lock_irqsave(&udc->lock, flags); - udc->vbus = (is_active != 0); + gadget->vbus_active = (is_active != 0); if (udc->driver) pullup(udc, is_active); else @@ -1586,7 +1586,7 @@ static struct at91_udc controller = { static void at91_vbus_update(struct at91_udc *udc, unsigned value) { value ^= udc->board.vbus_active_low; - if (value != udc->vbus) + if (value != udc->gadget.vbus_active) at91_vbus_session(&udc->gadget, value); } @@ -1817,7 +1817,7 @@ static int at91udc_probe(struct platform_device *pdev) * Get the initial state of VBUS - we cannot expect * a pending interrupt. */ - udc->vbus = gpio_get_value_cansleep(udc->board.vbus_pin) ^ + udc->gadget.vbus_active = gpio_get_value_cansleep(udc->board.vbus_pin) ^ udc->board.vbus_active_low; if (udc->board.vbus_polled) { @@ -1837,7 +1837,7 @@ static int at91udc_probe(struct platform_device *pdev) } } else { DBG("no VBUS detection, assuming always-on\n"); - udc->vbus = 1; + udc->gadget.vbus_active = 1; } retval = usb_add_gadget_udc(dev, &udc->gadget); if (retval) diff --git a/drivers/usb/gadget/at91_udc.h b/drivers/usb/gadget/at91_udc.h index e647d1c..6f8c7a4 100644 --- a/drivers/usb/gadget/at91_udc.h +++ b/drivers/usb/gadget/at91_udc.h @@ -115,7 +115,6 @@ struct at91_udc { struct usb_gadget gadget; struct at91_ep ep[NUM_ENDPOINTS]; struct usb_gadget_driver *driver; - unsigned vbus:1; unsigned enabled:1; unsigned clocked:1; unsigned suspended:1;