From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F03FC433E0 for ; Wed, 8 Jul 2020 18:04:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0A92D20720 for ; Wed, 8 Jul 2020 18:04:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="bum1GQm0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726339AbgGHSES (ORCPT ); Wed, 8 Jul 2020 14:04:18 -0400 Received: from rere.qmqm.pl ([91.227.64.183]:4514 "EHLO rere.qmqm.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725879AbgGHSEN (ORCPT ); Wed, 8 Jul 2020 14:04:13 -0400 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 4B26d75cftzMP; Wed, 8 Jul 2020 20:04:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1594231451; bh=xM/vWleWXURnCmkoT1m4VqMEiH0DaR/Qp4g8IWC4YVs=; h=Date:In-Reply-To:References:From:Subject:To:Cc:From; b=bum1GQm0msIj7p2nETmbGZKQvjcCCBWedhvYhFIwdap2XWn9HbP4noedwDNa9Bqf9 yJPsrYv7s7dGMaZcWKLKGDV6FdkSPNxd4uca77CeZwf9geRele95F5ejAyU47ERikf es/U/qXq156uvIANDAhaILaey+XAN/h/8ruo/L76LJoaBUr2hWqhyBJNxjbGzyUogM qbwXpz+YTAzfLBviQq1ZHqtKtqe8hmd+Vzal2ZgE7rym8D0S1L8ijOfqKLCoLFwIyP bOyC4dAkIyhlJrRlie0BDBBauiNyiyj0WoIZyKvJeq3logf0xzrkc1mMdhekB0DINQ mpdTeCwmyyG/g== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.102.3 at mail Date: Wed, 08 Jul 2020 20:04:10 +0200 Message-Id: <63121e624012996a2f6f5f3763270ad834667a12.1594231056.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Subject: [PATCH RESEND 3/3] usb: gadget: udc: atmel: implement .pullup callback MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: Alexandre Belloni , Cristian Birsan , Felipe Balbi , Greg Kroah-Hartman , Ludovic Desroches , Nicolas Ferre , Songjun Wu Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Implement udc->pullup callback, so that udc_connect/disconnect work. This is needed for composite gadget, as it assumes udc_disconnect() actually works and calls its ->disconnect callback. Signed-off-by: Michał Mirosław --- drivers/usb/gadget/udc/atmel_usba_udc.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c index 9342a3d24963..c5128c229c52 100644 --- a/drivers/usb/gadget/udc/atmel_usba_udc.c +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c @@ -1028,6 +1028,7 @@ usba_udc_set_selfpowered(struct usb_gadget *gadget, int is_selfpowered) return 0; } +static int atmel_usba_pullup(struct usb_gadget *gadget, int is_on); static int atmel_usba_start(struct usb_gadget *gadget, struct usb_gadget_driver *driver); static int atmel_usba_stop(struct usb_gadget *gadget); @@ -1101,6 +1102,7 @@ static const struct usb_gadget_ops usba_udc_ops = { .get_frame = usba_udc_get_frame, .wakeup = usba_udc_wakeup, .set_selfpowered = usba_udc_set_selfpowered, + .pullup = atmel_usba_pullup, .udc_start = atmel_usba_start, .udc_stop = atmel_usba_stop, .match_ep = atmel_usba_match_ep, @@ -1957,6 +1959,24 @@ static irqreturn_t usba_vbus_irq_thread(int irq, void *devid) return IRQ_HANDLED; } +static int atmel_usba_pullup(struct usb_gadget *gadget, int is_on) +{ + struct usba_udc *udc = container_of(gadget, struct usba_udc, gadget); + unsigned long flags; + u32 ctrl; + + spin_lock_irqsave(&udc->lock, flags); + ctrl = usba_readl(udc, CTRL); + if (is_on) + ctrl &= ~USBA_DETACH; + else + ctrl |= USBA_DETACH; + usba_writel(udc, CTRL, ctrl); + spin_unlock_irqrestore(&udc->lock, flags); + + return 0; +} + static int atmel_usba_start(struct usb_gadget *gadget, struct usb_gadget_driver *driver) { -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.7 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_ADSP_ALL, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34439C433E0 for ; Wed, 8 Jul 2020 18:26:59 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 047FE206F6 for ; Wed, 8 Jul 2020 18:26:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="DScmtZ+u"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="bum1GQm0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 047FE206F6 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=rere.qmqm.pl Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:MIME-Version:Subject:From:References:In-Reply-To: Message-Id:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=F2+wpcaMc/b30DNmPfWEmNXYYsUqQjmQ1kuGoS6qyCM=; b=DScmtZ+uJditNZTAT/KgSl+oU h+3qID4ScX0VljU4Qm+quUxY+96SzzlIIzV1XNKqvQrUNC5BOQIFbclAJDB5imHi2pZCZfyFRlaWQ U59XO8DWKL3dfOruBcsMIG8kg9LwsXfgdH6cs8x22ptIwEasafpiP6N8+uWX5QEDTNQ+QuMl7fFNY D1JTUJN1pW+F5ssfKZf0rcJA9Wl29WiSZ/CVd8uOqqm4OCdqc9oGvSlkArzlqDjafE0y7hJAKNavS JN3O23GAOTvZV8jbPGi/3p7ZQPzYv9N2KTxahEmjEZiwSEA4h82R4Pnu1IwKI1ZfTHcAjbcOg/mcc 1pQoYktBg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jtEl4-00083w-9M; Wed, 08 Jul 2020 18:25:26 +0000 Received: from rere.qmqm.pl ([91.227.64.183]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jtEQf-0006B8-UX for linux-arm-kernel@lists.infradead.org; Wed, 08 Jul 2020 18:04:41 +0000 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 4B26d75cftzMP; Wed, 8 Jul 2020 20:04:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1594231451; bh=xM/vWleWXURnCmkoT1m4VqMEiH0DaR/Qp4g8IWC4YVs=; h=Date:In-Reply-To:References:From:Subject:To:Cc:From; b=bum1GQm0msIj7p2nETmbGZKQvjcCCBWedhvYhFIwdap2XWn9HbP4noedwDNa9Bqf9 yJPsrYv7s7dGMaZcWKLKGDV6FdkSPNxd4uca77CeZwf9geRele95F5ejAyU47ERikf es/U/qXq156uvIANDAhaILaey+XAN/h/8ruo/L76LJoaBUr2hWqhyBJNxjbGzyUogM qbwXpz+YTAzfLBviQq1ZHqtKtqe8hmd+Vzal2ZgE7rym8D0S1L8ijOfqKLCoLFwIyP bOyC4dAkIyhlJrRlie0BDBBauiNyiyj0WoIZyKvJeq3logf0xzrkc1mMdhekB0DINQ mpdTeCwmyyG/g== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.102.3 at mail Date: Wed, 08 Jul 2020 20:04:10 +0200 Message-Id: <63121e624012996a2f6f5f3763270ad834667a12.1594231056.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Subject: [PATCH RESEND 3/3] usb: gadget: udc: atmel: implement .pullup callback MIME-Version: 1.0 To: Alexandre Belloni , Cristian Birsan , Felipe Balbi , Greg Kroah-Hartman , Ludovic Desroches , Nicolas Ferre , Songjun Wu X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200708_140422_489985_347718FB X-CRM114-Status: GOOD ( 10.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org SW1wbGVtZW50IHVkYy0+cHVsbHVwIGNhbGxiYWNrLCBzbyB0aGF0IHVkY19jb25uZWN0L2Rpc2Nv bm5lY3Qgd29yay4KVGhpcyBpcyBuZWVkZWQgZm9yIGNvbXBvc2l0ZSBnYWRnZXQsIGFzIGl0IGFz c3VtZXMgdWRjX2Rpc2Nvbm5lY3QoKQphY3R1YWxseSB3b3JrcyBhbmQgY2FsbHMgaXRzIC0+ZGlz Y29ubmVjdCBjYWxsYmFjay4KClNpZ25lZC1vZmYtYnk6IE1pY2hhxYIgTWlyb3PFgmF3IDxtaXJx LWxpbnV4QHJlcmUucW1xbS5wbD4KLS0tCiBkcml2ZXJzL3VzYi9nYWRnZXQvdWRjL2F0bWVsX3Vz YmFfdWRjLmMgfCAyMCArKysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDIwIGlu c2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9nYWRnZXQvdWRjL2F0bWVsX3Vz YmFfdWRjLmMgYi9kcml2ZXJzL3VzYi9nYWRnZXQvdWRjL2F0bWVsX3VzYmFfdWRjLmMKaW5kZXgg OTM0MmEzZDI0OTYzLi5jNTEyOGMyMjljNTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNiL2dhZGdl dC91ZGMvYXRtZWxfdXNiYV91ZGMuYworKysgYi9kcml2ZXJzL3VzYi9nYWRnZXQvdWRjL2F0bWVs X3VzYmFfdWRjLmMKQEAgLTEwMjgsNiArMTAyOCw3IEBAIHVzYmFfdWRjX3NldF9zZWxmcG93ZXJl ZChzdHJ1Y3QgdXNiX2dhZGdldCAqZ2FkZ2V0LCBpbnQgaXNfc2VsZnBvd2VyZWQpCiAJcmV0dXJu IDA7CiB9CiAKK3N0YXRpYyBpbnQgYXRtZWxfdXNiYV9wdWxsdXAoc3RydWN0IHVzYl9nYWRnZXQg KmdhZGdldCwgaW50IGlzX29uKTsKIHN0YXRpYyBpbnQgYXRtZWxfdXNiYV9zdGFydChzdHJ1Y3Qg dXNiX2dhZGdldCAqZ2FkZ2V0LAogCQlzdHJ1Y3QgdXNiX2dhZGdldF9kcml2ZXIgKmRyaXZlcik7 CiBzdGF0aWMgaW50IGF0bWVsX3VzYmFfc3RvcChzdHJ1Y3QgdXNiX2dhZGdldCAqZ2FkZ2V0KTsK QEAgLTExMDEsNiArMTEwMiw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgdXNiX2dhZGdldF9vcHMg dXNiYV91ZGNfb3BzID0gewogCS5nZXRfZnJhbWUJCT0gdXNiYV91ZGNfZ2V0X2ZyYW1lLAogCS53 YWtldXAJCQk9IHVzYmFfdWRjX3dha2V1cCwKIAkuc2V0X3NlbGZwb3dlcmVkCT0gdXNiYV91ZGNf c2V0X3NlbGZwb3dlcmVkLAorCS5wdWxsdXAJCQk9IGF0bWVsX3VzYmFfcHVsbHVwLAogCS51ZGNf c3RhcnQJCT0gYXRtZWxfdXNiYV9zdGFydCwKIAkudWRjX3N0b3AJCT0gYXRtZWxfdXNiYV9zdG9w LAogCS5tYXRjaF9lcAkJPSBhdG1lbF91c2JhX21hdGNoX2VwLApAQCAtMTk1Nyw2ICsxOTU5LDI0 IEBAIHN0YXRpYyBpcnFyZXR1cm5fdCB1c2JhX3ZidXNfaXJxX3RocmVhZChpbnQgaXJxLCB2b2lk ICpkZXZpZCkKIAlyZXR1cm4gSVJRX0hBTkRMRUQ7CiB9CiAKK3N0YXRpYyBpbnQgYXRtZWxfdXNi YV9wdWxsdXAoc3RydWN0IHVzYl9nYWRnZXQgKmdhZGdldCwgaW50IGlzX29uKQoreworCXN0cnVj dCB1c2JhX3VkYyAqdWRjID0gY29udGFpbmVyX29mKGdhZGdldCwgc3RydWN0IHVzYmFfdWRjLCBn YWRnZXQpOworCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CisJdTMyIGN0cmw7CisKKwlzcGluX2xvY2tf aXJxc2F2ZSgmdWRjLT5sb2NrLCBmbGFncyk7CisJY3RybCA9IHVzYmFfcmVhZGwodWRjLCBDVFJM KTsKKwlpZiAoaXNfb24pCisJCWN0cmwgJj0gflVTQkFfREVUQUNIOworCWVsc2UKKwkJY3RybCB8 PSBVU0JBX0RFVEFDSDsKKwl1c2JhX3dyaXRlbCh1ZGMsIENUUkwsIGN0cmwpOworCXNwaW5fdW5s b2NrX2lycXJlc3RvcmUoJnVkYy0+bG9jaywgZmxhZ3MpOworCisJcmV0dXJuIDA7Cit9CisKIHN0 YXRpYyBpbnQgYXRtZWxfdXNiYV9zdGFydChzdHJ1Y3QgdXNiX2dhZGdldCAqZ2FkZ2V0LAogCQlz dHJ1Y3QgdXNiX2dhZGdldF9kcml2ZXIgKmRyaXZlcikKIHsKLS0gCjIuMjAuMQoKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwg bWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8v bGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK