From patchwork Fri Jun 2 21:49:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Edwards X-Patchwork-Id: 1789838 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=sEctDBo4; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QXxXW6gpWz20Tk for ; Sat, 3 Jun 2023 07:51:23 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7E0EF86444; Fri, 2 Jun 2023 23:50:44 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sEctDBo4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CFFDA863A5; Fri, 2 Jun 2023 23:50:41 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 35F9085818 for ; Fri, 2 Jun 2023 23:50:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=cfsworks@gmail.com Received: by mail-il1-x12d.google.com with SMTP id e9e14a558f8ab-33d22754450so9278645ab.0 for ; Fri, 02 Jun 2023 14:50:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685742634; x=1688334634; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2smCUbCu5Y0wTVbhZsIgc4h6YMj6+8TyeFBpS8sUeUw=; b=sEctDBo439adyz6L86KH2SSBZj9OoiaF8O1kRjEXuNxjIvsLHhFc3SqlRfEjQFwY8o iiiGb5BLabV+FowC2u5naD2DR36DCKI8z/YdR6bhMP7RTLnK1OndEg/PUMdIOFmPg9ln JUzNA8pnA6/JPsyutnnQZQVZAQO3LPc6FSMZC8UjnwBiHkDjyy+KIMaXecSkHkRfj8Pi 3U9RN4z7ORrwNXNkXMb7+YIU6QRoNIW8EgxC8rltBZWmVQUHrqle9dvHzof5tDg2slgU gMVHFh+nb62r8LIqFT0oCgffmEYKiOcQWE+YwSKYX5ulpTYtFjSEOdmlmW70IKUjwep1 +ZWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685742634; x=1688334634; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2smCUbCu5Y0wTVbhZsIgc4h6YMj6+8TyeFBpS8sUeUw=; b=llHDuWaR7hD3RjG82pQLyioahL7A7e/3W2u9B/Wij0dthJZqt3xDXhd5N0e5VNqBRC uIT86KxO2rPDJJVnJhNsbpHxOdRfPN+E9rvSOG9NP/8v5qNjJ6jogwuJHlZUHVn9JMhc CscgguSpyKZBnmHrCHM2d3ic7AptYgxaF+iTZ9BBFs81wQGzOaP9Pvb+QGFaXi5D6TMk 5AtEUEUA30mEtjR9UNkCxK07exNs+wCRTa3Q/Z/7pStZwxTBNhqMYRpGSpDFw4A10Oz4 wefo9bf4Y5ZBd0HZQhjjrLBzERZLyftXuG30c8LrgNSZTl0RaEfz+b2363RLD0z7Kltk GGZA== X-Gm-Message-State: AC+VfDyPV4apiv/rcYyQ71wnQDGnTMZQOp/VQHr8IOMXhT8kjKXy+NNv DNpDDOk7CPkAVYD6DfJ3KfrEUcmTXFybLlFR X-Google-Smtp-Source: ACHHUZ5nfhsZd/sEQK4hafPvwqcz1+jc29RjE8MWt/jCSX6WAnrf3YbdeBOhiCVYQAQvTUS6a9ZaTA== X-Received: by 2002:a6b:f211:0:b0:760:ec52:254d with SMTP id q17-20020a6bf211000000b00760ec52254dmr4345433ioh.2.1685742634631; Fri, 02 Jun 2023 14:50:34 -0700 (PDT) Received: from celestia.nettie.lan ([2001:470:42c4:101:7b1d:313:b371:dfda]) by smtp.gmail.com with ESMTPSA id r4-20020a02c6c4000000b004164fe77c06sm566672jan.26.2023.06.02.14.50.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jun 2023 14:50:34 -0700 (PDT) From: Sam Edwards X-Google-Original-From: Sam Edwards To: u-boot@lists.denx.de Cc: Andre Przywara , Jagan Teki , Marek Vasut , Maksim Kiselev , Sam Edwards Subject: [PATCH 3/3] usb: musb-new: sunxi: make compatible with UDC/DM gadget model Date: Fri, 2 Jun 2023 15:49:58 -0600 Message-Id: <20230602214958.167909-4-CFSworks@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230602214958.167909-1-CFSworks@gmail.com> References: <20230602214958.167909-1-CFSworks@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Since many sunxi boards do not implement a `board_usb_init`, it's better if we just make the sunxi USB driver compatible with the DM gadget model, as many other musb-new variants already are. This change has been verified working on a T113s. Signed-off-by: Sam Edwards --- drivers/usb/musb-new/sunxi.c | 60 +++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 22 deletions(-) diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c index 65a528e229..ac6d1a41bb 100644 --- a/drivers/usb/musb-new/sunxi.c +++ b/drivers/usb/musb-new/sunxi.c @@ -432,6 +432,16 @@ static struct musb_hdrc_config musb_config_h3 = { .ram_bits = SUNXI_MUSB_RAM_BITS, }; +#if CONFIG_IS_ENABLED(DM_USB_GADGET) +int dm_usb_gadget_handle_interrupts(struct udevice *dev) { + struct sunxi_glue *glue = dev_get_priv(dev); + struct musb_host_data *host = &glue->mdata; + + host->host->isr(0, host->host); + return 0; +} +#endif + static int musb_usb_probe(struct udevice *dev) { struct sunxi_glue *glue = dev_get_priv(dev); @@ -440,10 +450,6 @@ static int musb_usb_probe(struct udevice *dev) void *base = dev_read_addr_ptr(dev); int ret; -#ifdef CONFIG_USB_MUSB_HOST - struct usb_bus_priv *priv = dev_get_uclass_priv(dev); -#endif - if (!base) return -EINVAL; @@ -474,25 +480,35 @@ static int musb_usb_probe(struct udevice *dev) pdata.platform_ops = &sunxi_musb_ops; pdata.config = glue->cfg->config; -#ifdef CONFIG_USB_MUSB_HOST - priv->desc_before_addr = true; - - pdata.mode = MUSB_HOST; - host->host = musb_init_controller(&pdata, &glue->dev, base); - if (!host->host) - return -EIO; - - ret = musb_lowlevel_init(host); - if (!ret) - printf("Allwinner mUSB OTG (Host)\n"); -#else - pdata.mode = MUSB_PERIPHERAL; - host->host = musb_register(&pdata, &glue->dev, base); - if (IS_ERR_OR_NULL(host->host)) - return -EIO; + if (IS_ENABLED(CONFIG_USB_MUSB_HOST)) { + struct usb_bus_priv *priv = dev_get_uclass_priv(dev); + priv->desc_before_addr = true; + + pdata.mode = MUSB_HOST; + host->host = musb_init_controller(&pdata, &glue->dev, base); + if (!host->host) + return -EIO; + + ret = musb_lowlevel_init(host); + if (!ret) + printf("Allwinner mUSB OTG (Host)\n"); + } else if (CONFIG_IS_ENABLED(DM_USB_GADGET)) { + pdata.mode = MUSB_PERIPHERAL; + host->host = musb_init_controller(&pdata, &glue->dev, base); + if (!host->host) + return -EIO; + + ret = usb_add_gadget_udc(&glue->dev, &host->host->g); + if (!ret) + printf("Allwinner mUSB OTG (Peripheral)\n"); + } else { + pdata.mode = MUSB_PERIPHERAL; + host->host = musb_register(&pdata, &glue->dev, base); + if (IS_ERR_OR_NULL(host->host)) + return -EIO; - printf("Allwinner mUSB OTG (Peripheral)\n"); -#endif + printf("Allwinner mUSB OTG (Peripheral)\n"); + } return ret; }