From patchwork Tue Jul 23 13:18:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zixun LI X-Patchwork-Id: 1963885 X-Patchwork-Delegate: mkorpershoek@baylibre.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=hifiphile-com.20230601.gappssmtp.com header.i=@hifiphile-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=YjwB1kI3; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WSyrs22gpz1ybY for ; Tue, 23 Jul 2024 23:38:05 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 710C688829; Tue, 23 Jul 2024 15:36:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=hifiphile.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=hifiphile-com.20230601.gappssmtp.com header.i=@hifiphile-com.20230601.gappssmtp.com header.b="YjwB1kI3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ADD338880E; Tue, 23 Jul 2024 15:18:51 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) (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 1A02B887B4 for ; Tue, 23 Jul 2024 15:18:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=hifiphile.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=admin@hifiphile.com Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4266fd39527so41416485e9.1 for ; Tue, 23 Jul 2024 06:18:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hifiphile-com.20230601.gappssmtp.com; s=20230601; t=1721740727; x=1722345527; darn=lists.denx.de; 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=T9XdfcPQBS5xIn5Nxx9aC2kI/E1yX32bhmjOXKsH09s=; b=YjwB1kI36kVZOHchHK3L6sMjY4DOBrNwy+d/89ttqysRSxjFNwb3zkiSKRVvHVX4kW HdPiZymsXLWHL4zf5E2Xb1o+CJYbsAoZVa393ANXsxJsIKQTLJuZy5FHpqTRzB+0ook2 Wu/xVvCdV/csArblvm3eUqB5mtLObqBUBh8nTqbvsjby/INNyS1EDzQgiuIdJ4OWmuOr v9tz9bjJh2yNNEf0PvcGcLuHVgbS1aqM98qFOLpZXNoWEyNPIxgPThCUDnB2PG0SSIbU LaWWy94XG0o0hbOXU2OGyAg501UnYfUM9SimVh3HMtbCnCjKDz+o76okm6oV+w2GMW/2 KPYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721740727; x=1722345527; 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=T9XdfcPQBS5xIn5Nxx9aC2kI/E1yX32bhmjOXKsH09s=; b=mIMSnn0nn5/TUCIQdhKNKEsO+hZFLEPKLuiRMlLU5+vGXuNK78PINsVrc0OIUn/A6R S3I+cpBd56XnGbuqspMsUL5V8Zhy6PyAuwg0aaw5NiP2Rko/34SoMWdh3l4onT1WSAQ4 pEhQEy6KmQd3EiJzgSu8omE8P2daEWyvm51GYAOFZ04ick0GeBfzo1SEy1Cc/SU/J43i /p4ZNYrnEYlJ2MPxw05oT9J6lNhpWXIrFQsDtParKCNJenTthp8o0jaU+teG7ekC8sJ1 LTv0f5n+dJnOqPHAgethPC1bEDh75Hdz5u5ltJkRZMTU5+vpuhLsFp1F/LjxMHZxYxM3 XMwg== X-Forwarded-Encrypted: i=1; AJvYcCXBjSxn4KZ0hqv2eS5CM1ZvN2kCleW9BNcTH3dotETpilK9pTeFs/D5TyP7whZLgDz0fRpoqmxiUMDAz3Qd6dfecIjYDQ== X-Gm-Message-State: AOJu0Yz32f6Oz+k4vCbRqvWXrSMeUlXHK0c86Njqf92S5CInWCLROGgn 8cKDCVTdBGKdp+VACPIqoYnPp+WieThhDCYy++/ufM03+3SxfnU5d7MilRAYZD0= X-Google-Smtp-Source: AGHT+IG/WSa/ZWQFSEcn6vpl176ScUXiqj9+j7UIqxct+AWGijYLrUQFl295C5p5VZDqEo3pDB2vXw== X-Received: by 2002:a05:600c:1382:b0:425:5eec:d261 with SMTP id 5b1f17b1804b1-427ed06844amr22925705e9.34.1721740727401; Tue, 23 Jul 2024 06:18:47 -0700 (PDT) Received: from localhost.localdomain ([78.199.60.143]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427db2a4e3bsm140312545e9.44.2024.07.23.06.18.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jul 2024 06:18:47 -0700 (PDT) From: Zixun LI X-Google-Original-From: Zixun LI To: Lukasz Majewski , Mattijs Korpershoek , Marek Vasut , Tom Rini Cc: Zixun LI , u-boot@lists.denx.de Subject: [PATCH v3 1/7] usb: gadget: atmel: Sort includes Date: Tue, 23 Jul 2024 15:18:08 +0200 Message-ID: <20240723131817.262596-2-zli@ogga.fr> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723131817.262596-1-zli@ogga.fr> References: <20240723131817.262596-1-zli@ogga.fr> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 23 Jul 2024 15:35:55 +0200 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 Sort includes in alphabetical order. Signed-off-by: Zixun LI Reviewed-by: Marek Vasut Reviewed-by: Mattijs Korpershoek --- drivers/usb/gadget/atmel_usba_udc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index f99553df8d..5f78251fdb 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c @@ -7,16 +7,16 @@ * Bo Shen */ -#include -#include +#include #include #include +#include +#include #include #include #include #include #include -#include #include "atmel_usba_udc.h" From patchwork Tue Jul 23 13:18:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zixun LI X-Patchwork-Id: 1963887 X-Patchwork-Delegate: mkorpershoek@baylibre.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=hifiphile-com.20230601.gappssmtp.com header.i=@hifiphile-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=Yj4bk85i; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WSysS1Vtpz1ybY for ; Tue, 23 Jul 2024 23:38:36 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 549AC88842; Tue, 23 Jul 2024 15:36:01 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=hifiphile.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=hifiphile-com.20230601.gappssmtp.com header.i=@hifiphile-com.20230601.gappssmtp.com header.b="Yj4bk85i"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9AC09887D2; Tue, 23 Jul 2024 15:18:58 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,T_SPF_TEMPERROR autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) (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 62407887D6 for ; Tue, 23 Jul 2024 15:18:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=hifiphile.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=admin@hifiphile.com Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4279c10a40eso40207055e9.3 for ; Tue, 23 Jul 2024 06:18:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hifiphile-com.20230601.gappssmtp.com; s=20230601; t=1721740728; x=1722345528; darn=lists.denx.de; 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=3sYTjDtZGoMz/GaMNdnG+ErxJENySlKtvUc5CR1r5sQ=; b=Yj4bk85i2ojIUHNzseAb2R+LqZwYeQM3SYQJIJxX9Y7dHQyHYH1KhHRguodTOHFblV eVTd3FWtTkPZditPitoIeMop9OPgcw1nxv9aAgfwb8bp5UI9V5qVFgQ7LrCUpbuzFiuG A5DpUEL8naBiHE6DxfvxyZYPhz3lBV0OO7Yq5L1Ur+ibVPwrgeIGAJyd6ouZ4YHEuBvs 2i2Ge9cc63WITCTz+XCRVIkeT3pEyo1AXR/UkBcF7YdnMerrHtWZTXl4ka08rIeKzY9e Yxii29wjNTO/S5lUr2WLwNhnC3YffIcRHEO++vdeRto16mhmfBpd0iMojn1qDMd3b6l7 PJLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721740728; x=1722345528; 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=3sYTjDtZGoMz/GaMNdnG+ErxJENySlKtvUc5CR1r5sQ=; b=RWo3IqSnYteEytSe/Nc/eeiLXZ/HgeXMpHsdqe3AO1JBZgATQhj7+capCowadMIpB2 YoeuPmMyswcGnXv+/74pcLc/uO9DwM75OAUmJR7lH6JE9N3kD/spFZg5rXU1UrWtFm04 pPjezkNA6H/zQTWhOXq9bROTNdSZBVdASo4gI94OfWiKIwud8KlwYDB2aOu4r1x/l2Us f8g2h4SMfJT/EMlaBpR4wSDu7luERGu/GCVE9GFFv8Rdk4ZyVh+WkulUHAcVI8N2mxH6 pTRaK6U6cYOhDku/XQC3ijUyZz4wvjb7CPzQILc6bOzlc9VmAvNtn9+r6jXEmaFg5YBl bmsQ== X-Forwarded-Encrypted: i=1; AJvYcCVUoW2d1d1m1R1SpBjLbBFnug67KB2OM2I6GYpmVjtouxx+H512kJw8cPhP+SyX8diI5jeBOwjXWB3Cj4WCWW3XrSef5A== X-Gm-Message-State: AOJu0YxYZ+/16w+ee5nRxPmwvsN3z1jtDEGMFhBM8enfw3YPSIzQOR1W eS7Cqjzm0H6/5uEj0OgH7X+5OuVk2vrvmUXXkt/tpUbIkpI4fAHfhvnFQI0VaoM= X-Google-Smtp-Source: AGHT+IFoOwjzZb0515G9Q+jwOXzU6CPjM7uijRaXP04tsvPDN3kKsKXK9mRr6Pjj6YN1FzlkZap17Q== X-Received: by 2002:a05:600c:198a:b0:426:5ef5:bcb1 with SMTP id 5b1f17b1804b1-427dc516030mr64487495e9.6.1721740727922; Tue, 23 Jul 2024 06:18:47 -0700 (PDT) Received: from localhost.localdomain ([78.199.60.143]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427db2a4e3bsm140312545e9.44.2024.07.23.06.18.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jul 2024 06:18:47 -0700 (PDT) From: Zixun LI X-Google-Original-From: Zixun LI To: Lukasz Majewski , Mattijs Korpershoek , Marek Vasut , Tom Rini Cc: Zixun LI , u-boot@lists.denx.de Subject: [PATCH v3 2/7] usb: gadget: atmel: Replace printf() and pr_err() by log_err() Date: Tue, 23 Jul 2024 15:18:09 +0200 Message-ID: <20240723131817.262596-3-zli@ogga.fr> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723131817.262596-1-zli@ogga.fr> References: <20240723131817.262596-1-zli@ogga.fr> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 23 Jul 2024 15:35:55 +0200 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 To have a uniform printing function, also drop linux/printk.h as no longer used. Signed-off-by: Zixun LI Reviewed-by: Marek Vasut Reviewed-by: Mattijs Korpershoek --- drivers/usb/gadget/atmel_usba_udc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index 5f78251fdb..83fdc36870 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c @@ -7,13 +7,13 @@ * Bo Shen */ +#include #include #include #include #include #include #include -#include #include #include #include @@ -1204,12 +1204,12 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) int ret; if (!driver || !driver->bind || !driver->setup) { - printf("bad paramter\n"); + log_err("bad paramter\n"); return -EINVAL; } if (udc->driver) { - printf("UDC already has a gadget driver\n"); + log_err("UDC already has a gadget driver\n"); return -EBUSY; } @@ -1219,7 +1219,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) ret = driver->bind(&udc->gadget); if (ret) { - pr_err("driver->bind() returned %d\n", ret); + log_err("driver->bind() returned %d\n", ret); udc->driver = NULL; } @@ -1231,7 +1231,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) struct usba_udc *udc = &controller; if (!driver || !driver->unbind || !driver->disconnect) { - pr_err("bad paramter\n"); + log_err("bad parameter\n"); return -EINVAL; } @@ -1252,7 +1252,7 @@ static struct usba_ep *usba_udc_pdata(struct usba_platform_data *pdata, eps = malloc(sizeof(struct usba_ep) * pdata->num_ep); if (!eps) { - pr_err("failed to alloc eps\n"); + log_err("failed to alloc eps\n"); return NULL; } From patchwork Tue Jul 23 13:18:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zixun LI X-Patchwork-Id: 1963886 X-Patchwork-Delegate: mkorpershoek@baylibre.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=hifiphile-com.20230601.gappssmtp.com header.i=@hifiphile-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=Km0P6vYh; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WSys86578z1ybY for ; Tue, 23 Jul 2024 23:38:20 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D6ED48883D; Tue, 23 Jul 2024 15:36:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=hifiphile.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=hifiphile-com.20230601.gappssmtp.com header.i=@hifiphile-com.20230601.gappssmtp.com header.b="Km0P6vYh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 45AEC887DB; Tue, 23 Jul 2024 15:18:57 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) (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 D4A74887FF for ; Tue, 23 Jul 2024 15:18:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=hifiphile.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=admin@hifiphile.com Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4266ea6a488so47850575e9.1 for ; Tue, 23 Jul 2024 06:18:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hifiphile-com.20230601.gappssmtp.com; s=20230601; t=1721740730; x=1722345530; darn=lists.denx.de; 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=iYLHDPjDOFxn0HJGyorIeqJ/iWGilv+5T/P+L6gwcZI=; b=Km0P6vYhcUl29QpvcXtXJNuOCj5xEq55yR7sLSzw4aAGdVOJd4lGc29Z57/+31lVjr TKf8jsUoOK8Xrbw4nJar36zCoaE/hMJamzMgZfLslV9oQSKShdHoMoTc+RDj0Q/Wmi0e Kn9sCjddD6mMMoV33NQmrb9zvmkbe2i90cNT/Kmr3nuo8ZYABiHQF7q2TKatbmWVp195 YrBqRHZ0ZVq62ZSDxVhcAWtba6uQApWnlj5DToDlRSkNkRgcdKbta0BKo5pT8vPyv00y OIsePfzbFZQf1xENBoW3fCbD3Frp4JPRLR0lx2QyoeEnQ9Tley2Vgv/ByV8cd0NghJ8b romw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721740730; x=1722345530; 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=iYLHDPjDOFxn0HJGyorIeqJ/iWGilv+5T/P+L6gwcZI=; b=Eq618HJD3qwdpNsRnnwFrnqjRt8M1baZWTdY0+F7HkoAC8mmoL/hmbTEAIlEQuk+XP Lh+AMtASwMzlpoxfCIj+oERDFkXbCNjdc3cJbkIg8gdt3m3p1fwT2Z+iENDubmHt2yf6 +8Zbly8GVhcOniUqbXQaZvqkRpgLHC0MgXsmA2hvajwzIWPtC3/a1j/B4keHfsI5IJPc Li+5DkDxSOhA6Hi1R2dRz8gvjVEx9Jl4eAl2KZhwtwDseazQBDtOFv1e/vxVWnWBFPhL suBTAJkQkTyG8jVRxgB6G2CA8iq3zlP+G+QEa400Rah+macO3g9JUYvbnX5IqYxvToQG xtUg== X-Forwarded-Encrypted: i=1; AJvYcCXbCPtaaqTar5LITufUiiLgencR0ehiBKHvYYKcu89EdGjuU2FT9TzubFb7bXaTHOVI7snXWri0AhSfYLOVKkFhXDXSLA== X-Gm-Message-State: AOJu0Yxo/vQhdF1TpEbQHWxQkifwRZRrLi4A3BQIZYtf1OHOfW2rd4AT ACmYjRU/9ABtBmSbzWUyT+MwPFQxf+abpcQyMD2DKvF/TQH67quqBkCiRkTCyIw= X-Google-Smtp-Source: AGHT+IHZ3Y0tiJm5A203BzyQ3LPKwTTqnDL3B/Ou9bqIId/eO93PjWzl6AKgdzErBT4V3DBAfZPntA== X-Received: by 2002:a05:600c:1987:b0:426:52a5:1ca4 with SMTP id 5b1f17b1804b1-427dc5292e6mr83770755e9.21.1721740728475; Tue, 23 Jul 2024 06:18:48 -0700 (PDT) Received: from localhost.localdomain ([78.199.60.143]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427db2a4e3bsm140312545e9.44.2024.07.23.06.18.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jul 2024 06:18:48 -0700 (PDT) From: Zixun LI X-Google-Original-From: Zixun LI To: Lukasz Majewski , Mattijs Korpershoek , Marek Vasut , Tom Rini Cc: Zixun LI , u-boot@lists.denx.de Subject: [PATCH v3 3/7] usb: gadget: atmel: Fix typo in usb_gadget_register_driver() Date: Tue, 23 Jul 2024 15:18:10 +0200 Message-ID: <20240723131817.262596-4-zli@ogga.fr> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723131817.262596-1-zli@ogga.fr> References: <20240723131817.262596-1-zli@ogga.fr> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 23 Jul 2024 15:35:55 +0200 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 Replace "paramter" by "parameter". Signed-off-by: Zixun LI Reviewed-by: Marek Vasut --- drivers/usb/gadget/atmel_usba_udc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index 83fdc36870..2e3d8f36a2 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c @@ -1204,7 +1204,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) int ret; if (!driver || !driver->bind || !driver->setup) { - log_err("bad paramter\n"); + log_err("bad parameter\n"); return -EINVAL; } From patchwork Tue Jul 23 13:18:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zixun LI X-Patchwork-Id: 1963888 X-Patchwork-Delegate: mkorpershoek@baylibre.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=hifiphile-com.20230601.gappssmtp.com header.i=@hifiphile-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=VnJNZFYI; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WSysl20Vxz1ybY for ; Tue, 23 Jul 2024 23:38:51 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CB49088853; Tue, 23 Jul 2024 15:36:01 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=hifiphile.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=hifiphile-com.20230601.gappssmtp.com header.i=@hifiphile-com.20230601.gappssmtp.com header.b="VnJNZFYI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 04C8C887C0; Tue, 23 Jul 2024 15:19:02 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) (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 A324E88813 for ; Tue, 23 Jul 2024 15:18:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=hifiphile.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=admin@hifiphile.com Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4266ea6a412so39671815e9.1 for ; Tue, 23 Jul 2024 06:18:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hifiphile-com.20230601.gappssmtp.com; s=20230601; t=1721740729; x=1722345529; darn=lists.denx.de; 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=BffhSfFFH7m2hR+x2MtsNlaofRjQXyE052NEDAF5rMg=; b=VnJNZFYIsIFVdGjLVxkZNEPxtpJiKoRCHow0g2G+pyuf48ZYn0lkn6b9jYke1F9vFO zn1sbTLZpvglRiW5hcyNu+6UjhBMMcxWX5fqgE6VbuKMHISqbgk/iZzpNKolY/USblgy 3OdLmTtzKHJ5+gADh1QqDN78O13HiTiv6FfYLxC5MZca1IW8+irARSXEj6l0bfERsiXT Kv1QWBwisYkxREih0R6fa/FB3ouURhxc042X3YBKvPPZkkUbktCM+9gN1V1YH4UsgO5o ck24T+LC8A0DHkjUu2Bq6BwagmY219ipS4y5cnfe+4z1lZFA1c+LkKQRLxFFrNXq+7SK VC6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721740729; x=1722345529; 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=BffhSfFFH7m2hR+x2MtsNlaofRjQXyE052NEDAF5rMg=; b=m+uiCbKUZSiTR72KFsyrnkwI/8k1g2ZL9qvAPrVE4sJZUu9Fnuhd0YSon11SDt2Bzm p9GY0DKMcgJn3lwL5WN7AsRu2dBloxU0DWbcvVW49iUfrZD+AYXdGI2hIeRk4b5nRopO 7hPCHcYyIP9reN2kc7euRLxJlR1pfEUtpkjPwmn0B+EuIAKc+j1glVlbSxZxEV74EN5x QYfbZkDHNq+2ZQsD3fE/ShHLJpCvuwD6bB3WWPfAgysPb7p9C6CUAbnJa8YGnIiG4ILK SUruojBqjM9B1GFNOQxbpO6OoB6z2vsYX9UWSFg+yOu/tAKiGbTGD5Zctnw+9gllK4Pr /Mog== X-Forwarded-Encrypted: i=1; AJvYcCVAsD/M06mOkr3SYc32fVR+V8Ay2Yl/CDoTcSu1+3icvztbUEpceADjtALNPwkijqYx6NBANxHhIBqVqVQJM6jTGVRG6w== X-Gm-Message-State: AOJu0Yx1cV5ONewpOlnU1iJID4WEPctLLr98cUracA12PNSKS2rFDmUy 8cFMbraxZdmvuHZmJWa86jJR+VdwkRLrBfTedy8mhG1WK+p/dGBM665xbBz/65M= X-Google-Smtp-Source: AGHT+IFk1pF0wFVOxUZXYQRPAZz5vLhn0EEtFc9+dxG0y9dR4RecJ450mLbOhTkIWaJr1BWLqlQCxw== X-Received: by 2002:a05:600c:3148:b0:426:6416:aa7a with SMTP id 5b1f17b1804b1-427dc59faeemr72385825e9.34.1721740729127; Tue, 23 Jul 2024 06:18:49 -0700 (PDT) Received: from localhost.localdomain ([78.199.60.143]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427db2a4e3bsm140312545e9.44.2024.07.23.06.18.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jul 2024 06:18:48 -0700 (PDT) From: Zixun LI X-Google-Original-From: Zixun LI To: Lukasz Majewski , Mattijs Korpershoek , Marek Vasut , Tom Rini Cc: Zixun LI , u-boot@lists.denx.de Subject: [PATCH v3 4/7] usb: gadget: atmel: Move usba_udc_pdata() with other static functions Date: Tue, 23 Jul 2024 15:18:11 +0200 Message-ID: <20240723131817.262596-5-zli@ogga.fr> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723131817.262596-1-zli@ogga.fr> References: <20240723131817.262596-1-zli@ogga.fr> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 23 Jul 2024 15:35:56 +0200 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 To make all static functions in the top, no functional change. Signed-off-by: Zixun LI Reviewed-by: Marek Vasut Reviewed-by: Mattijs Korpershoek --- drivers/usb/gadget/atmel_usba_udc.c | 80 ++++++++++++++--------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index 2e3d8f36a2..a3d24501ba 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c @@ -1179,6 +1179,46 @@ static int atmel_usba_stop(struct usba_udc *udc) return 0; } +static struct usba_ep *usba_udc_pdata(struct usba_platform_data *pdata, + struct usba_udc *udc) +{ + struct usba_ep *eps; + int i; + + eps = malloc(sizeof(struct usba_ep) * pdata->num_ep); + if (!eps) { + log_err("failed to alloc eps\n"); + return NULL; + } + + udc->gadget.ep0 = &eps[0].ep; + + INIT_LIST_HEAD(&udc->gadget.ep_list); + INIT_LIST_HEAD(&eps[0].ep.ep_list); + + for (i = 0; i < pdata->num_ep; i++) { + struct usba_ep *ep = &eps[i]; + + ep->ep_regs = udc->regs + USBA_EPT_BASE(i); + ep->dma_regs = udc->regs + USBA_DMA_BASE(i); + ep->fifo = udc->fifo + USBA_FIFO_BASE(i); + ep->ep.ops = &usba_ep_ops; + ep->ep.name = pdata->ep[i].name; + ep->ep.maxpacket = pdata->ep[i].fifo_size; + ep->fifo_size = ep->ep.maxpacket; + ep->udc = udc; + INIT_LIST_HEAD(&ep->queue); + ep->nr_banks = pdata->ep[i].nr_banks; + ep->index = pdata->ep[i].index; + ep->can_dma = pdata->ep[i].can_dma; + ep->can_isoc = pdata->ep[i].can_isoc; + if (i) + list_add_tail(&ep->ep.ep_list, &udc->gadget.ep_list); + }; + + return eps; +} + static struct usba_udc controller = { .regs = (unsigned *)ATMEL_BASE_UDPHS, .fifo = (unsigned *)ATMEL_BASE_UDPHS_FIFO, @@ -1244,46 +1284,6 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) return 0; } -static struct usba_ep *usba_udc_pdata(struct usba_platform_data *pdata, - struct usba_udc *udc) -{ - struct usba_ep *eps; - int i; - - eps = malloc(sizeof(struct usba_ep) * pdata->num_ep); - if (!eps) { - log_err("failed to alloc eps\n"); - return NULL; - } - - udc->gadget.ep0 = &eps[0].ep; - - INIT_LIST_HEAD(&udc->gadget.ep_list); - INIT_LIST_HEAD(&eps[0].ep.ep_list); - - for (i = 0; i < pdata->num_ep; i++) { - struct usba_ep *ep = &eps[i]; - - ep->ep_regs = udc->regs + USBA_EPT_BASE(i); - ep->dma_regs = udc->regs + USBA_DMA_BASE(i); - ep->fifo = udc->fifo + USBA_FIFO_BASE(i); - ep->ep.ops = &usba_ep_ops; - ep->ep.name = pdata->ep[i].name; - ep->ep.maxpacket = pdata->ep[i].fifo_size; - ep->fifo_size = ep->ep.maxpacket; - ep->udc = udc; - INIT_LIST_HEAD(&ep->queue); - ep->nr_banks = pdata->ep[i].nr_banks; - ep->index = pdata->ep[i].index; - ep->can_dma = pdata->ep[i].can_dma; - ep->can_isoc = pdata->ep[i].can_isoc; - if (i) - list_add_tail(&ep->ep.ep_list, &udc->gadget.ep_list); - }; - - return eps; -} - int usba_udc_probe(struct usba_platform_data *pdata) { struct usba_udc *udc; From patchwork Tue Jul 23 13:18:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zixun LI X-Patchwork-Id: 1963889 X-Patchwork-Delegate: mkorpershoek@baylibre.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=hifiphile-com.20230601.gappssmtp.com header.i=@hifiphile-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=mSJgr43X; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WSyt24cmDz1ybY for ; Tue, 23 Jul 2024 23:39:06 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4547588860; Tue, 23 Jul 2024 15:36:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=hifiphile.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=hifiphile-com.20230601.gappssmtp.com header.i=@hifiphile-com.20230601.gappssmtp.com header.b="mSJgr43X"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8A904887B4; Tue, 23 Jul 2024 15:19:02 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) (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 552D38880E for ; Tue, 23 Jul 2024 15:18:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=hifiphile.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=admin@hifiphile.com Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4279c10a40eso40207225e9.3 for ; Tue, 23 Jul 2024 06:18:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hifiphile-com.20230601.gappssmtp.com; s=20230601; t=1721740730; x=1722345530; darn=lists.denx.de; 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=OT439pExSoYKY20APDUlMHlXpFMN3brwRzaTUhY/qC0=; b=mSJgr43XmIu/RySWbQxILIoWH2l5prMNtchlmbycOVq12NuiGaTG7HgO8QvOcKZR4m 3ILSBYRXeVNWJl8++3T3htq9XCEUlR1Y6VcpR+tl3HOAvNEdB43oteLvN4i5/zD1Lj8I Jp/OLd+onbslg7Uc1z86tyEU/thIbUiDH5H++RPf3Pce8GBTUQK3e6uVpNpxiT7IcX06 ZoxPMhfsWJ8EPMTIL5mdkxcD4RfBM8IoIPZioT1C1lwQ9eBFAGlRDMiD4w/6OtFfpJ3D ZWecGrR55kb0pjdUuBM9OmPEPpV2Q9cbkvK0wHxE4E49bRlMPZI8rlgyJblrMVYEsqIL eYuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721740730; x=1722345530; 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=OT439pExSoYKY20APDUlMHlXpFMN3brwRzaTUhY/qC0=; b=wBw13AW5/WOg3Zhz/Ga8Jfs+FlI/JKGUN093s3sOp3g+PjVavXyqJI/sEuKQXCql/K qDH+r8Ibnv6F+QVMuHSyW+R/0OkpTmy6jPhq+AbY0LTKRHmOoJd5hoKCquodr2eqHx+W YiWZv53Ds1MkIrMEpxGYagG0BySxmv+OT5TEItsY0e0DOXJ+DlWcPq7GpCG3ZEDSBZF1 Eh7W/eiL6XC9COfIiAb0qp4AURIi6+JBKKc4QudDVh8+MUwr8WyVIah8uaCoGqOp2Jz1 jxAqRFNdRuNzCIY3PuR/Q/1qoDNrHNtgylTtGGQErhiJHwez6Ge/Y9XAijlvrnL0cV7V bUzw== X-Forwarded-Encrypted: i=1; AJvYcCXGCT4VZs+DqLl+0/+/LaCAJFX0N/LI88P6suo0hqKE7QZorJYNJovESbi7do643jlkTUTJIoXL5omPO63WVa0vd629Tw== X-Gm-Message-State: AOJu0YxZKRKk7f8oBPMhzHTEbDqsvUlohCrudkUz+9M6WQbBLpIuudD3 ZxJl1ePOqHCxKHsCMk3ZthpyjMwFs7A+Lhnb4AS2oFHdZWo2c0oQZ2FQXbhtsWU= X-Google-Smtp-Source: AGHT+IGs1RaFn1y9JZA9O+sxiCGnOAqao2gkuYKfzPD6uFEIMum9RFoal24RUq+Me/adUg8auGtwlQ== X-Received: by 2002:a05:600c:458a:b0:426:66fb:fcd6 with SMTP id 5b1f17b1804b1-427dc51600cmr60147425e9.3.1721740729839; Tue, 23 Jul 2024 06:18:49 -0700 (PDT) Received: from localhost.localdomain ([78.199.60.143]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427db2a4e3bsm140312545e9.44.2024.07.23.06.18.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jul 2024 06:18:49 -0700 (PDT) From: Zixun LI X-Google-Original-From: Zixun LI To: Lukasz Majewski , Mattijs Korpershoek , Marek Vasut , Tom Rini Cc: Zixun LI , u-boot@lists.denx.de Subject: [PATCH v3 5/7] usb: gadget: atmel: Rename atmel_usba_start()/_stop() to usba_udc_enable()/_disable() Date: Tue, 23 Jul 2024 15:18:12 +0200 Message-ID: <20240723131817.262596-6-zli@ogga.fr> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723131817.262596-1-zli@ogga.fr> References: <20240723131817.262596-1-zli@ogga.fr> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 23 Jul 2024 15:35:56 +0200 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 Rename atmel_usba_start() / atmel_usba_stop() to usba_udc_enable() / usba_udc_disable(), remove atmel_ prefix to be inline with other functions. Also avoid confusion with DM start() / stop() functions. Signed-off-by: Zixun LI Reviewed-by: Marek Vasut Reviewed-by: Mattijs Korpershoek --- drivers/usb/gadget/atmel_usba_udc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index a3d24501ba..ea9ad7585e 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c @@ -1153,7 +1153,7 @@ static int usba_udc_irq(struct usba_udc *udc) return 0; } -static int atmel_usba_start(struct usba_udc *udc) +static int usba_udc_enable(struct usba_udc *udc) { udc->devstatus = 1 << USB_DEVICE_SELF_POWERED; @@ -1168,7 +1168,7 @@ static int atmel_usba_start(struct usba_udc *udc) return 0; } -static int atmel_usba_stop(struct usba_udc *udc) +static int usba_udc_disable(struct usba_udc *udc) { udc->gadget.speed = USB_SPEED_UNKNOWN; reset_all_endpoints(udc); @@ -1253,7 +1253,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) return -EBUSY; } - atmel_usba_start(udc); + usba_udc_enable(udc); udc->driver = driver; @@ -1279,7 +1279,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) driver->unbind(&udc->gadget); udc->driver = NULL; - atmel_usba_stop(udc); + usba_udc_disable(udc); return 0; } From patchwork Tue Jul 23 13:18:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zixun LI X-Patchwork-Id: 1963891 X-Patchwork-Delegate: mkorpershoek@baylibre.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=hifiphile-com.20230601.gappssmtp.com header.i=@hifiphile-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=A5Nd7rVh; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WSytK4KKGz1ybY for ; Tue, 23 Jul 2024 23:39:21 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AA89388867; Tue, 23 Jul 2024 15:36:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=hifiphile.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=hifiphile-com.20230601.gappssmtp.com header.i=@hifiphile-com.20230601.gappssmtp.com header.b="A5Nd7rVh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ED70788747; Tue, 23 Jul 2024 15:19:05 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) (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 EDBF4887FA for ; Tue, 23 Jul 2024 15:18:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=hifiphile.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=admin@hifiphile.com Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-367ab76d5e1so2138157f8f.3 for ; Tue, 23 Jul 2024 06:18:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hifiphile-com.20230601.gappssmtp.com; s=20230601; t=1721740730; x=1722345530; darn=lists.denx.de; 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=087EMM/M2N812PYZPjuCaXgHe3mKHrAvwPzuqbBN0Mw=; b=A5Nd7rVhnzcssrwIKGczRRpM0A1PZkCifh2FoGfFYxdknM5zbVCyDtOwdQrO9kalWy n6Z8+pFt6USlpFzrhGPNY1ISRKHzItwAIzY5STnpWnfkPdtODRF/uvldJk7fqVKm7EaS 9/4ViT6DqhzFYlA994PD9fWjn4/1QpGlfYYtWI9BtkMU+IUH0EXaqJ8yp50S5Y9MuHsQ dT7S7mRT4MXfUmkqwBjQrkqW4sulpqlgEobX4dV4ru8kD8YVUeSkdhKkI9QzY8DhUpdg GVU9ckoibWZqXru1x+XLmpObkThnm5C38EXnAbGjCWRn82sr/vgCX/fs7flQ8cqUvcYH 5WFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721740730; x=1722345530; 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=087EMM/M2N812PYZPjuCaXgHe3mKHrAvwPzuqbBN0Mw=; b=JfCo9x3BXnZfnigdqD8eaqH9CTTJMosIm0f0/WiFE1DRRQx3ZbKYGsNpAYyhQBck5I R0CkC/aasyxXT+EbRI902DS+Vza7lHOvFudraT6LhdxI73TGhcp/7mPXBG/d2A5ARR8X kBlO6NeTT5A19QzFzOdAQhuoC/Zdn66oBMeQ1dtp2NhMsfjrg1IH+yKroz1xMuV0RIeO FFPsJhPDxwX3iY63FMTGakX7kgqZu6UMzx6vs9Vmjyojx8AcX+oQHCGhUl0jia1g4XZy co5qPv0pnvuiiMP3y5U/wZlaE8tApFXK0+hb7kH2yXVBqrhLV8NGIIvfNY6qprX0GJtQ SnYg== X-Forwarded-Encrypted: i=1; AJvYcCWicfTWb4buqQjI3K/+UhBVlaGdq5N2gd7GPubFG2l4HwOvyz6n6RDAdr8a8BEPIw9jOjREBF4NNpxnqeADjxwJnkWo8g== X-Gm-Message-State: AOJu0Yy23F2o4UuiLf/VZr1Gt91ZltALBHeGzXZSWXvWJY7rEpHZKsBc IsIiu01qjlKRskiahpKMe2xAuQzuaftEV+cfrTZIie5GhbNgawMYtR3pxcIgw2IdhIBbMBMDSDy jEeLV6w== X-Google-Smtp-Source: AGHT+IEpeaYsqodHLkQ0INVrP5Y/FHPwnU6ft4kXY3DqbMm6wwQeX1AWKpnN63ZLL9fD8jrklUuGng== X-Received: by 2002:adf:e58f:0:b0:368:3ef6:f049 with SMTP id ffacd0b85a97d-369bbbb3178mr6182084f8f.2.1721740730365; Tue, 23 Jul 2024 06:18:50 -0700 (PDT) Received: from localhost.localdomain ([78.199.60.143]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427db2a4e3bsm140312545e9.44.2024.07.23.06.18.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jul 2024 06:18:50 -0700 (PDT) From: Zixun LI X-Google-Original-From: Zixun LI To: Lukasz Majewski , Mattijs Korpershoek , Marek Vasut , Tom Rini Cc: Zixun LI , u-boot@lists.denx.de Subject: [PATCH v3 6/7] usb: gadget: atmel: Add attach/detach support Date: Tue, 23 Jul 2024 15:18:13 +0200 Message-ID: <20240723131817.262596-7-zli@ogga.fr> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723131817.262596-1-zli@ogga.fr> References: <20240723131817.262596-1-zli@ogga.fr> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 23 Jul 2024 15:35:56 +0200 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 Add controller attach/detach support by using usb_gadget_ops.pullup() method. Signed-off-by: Zixun LI Reviewed-by: Marek Vasut Reviewed-by: Mattijs Korpershoek --- drivers/usb/gadget/atmel_usba_udc.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index ea9ad7585e..a7b96449f8 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c @@ -506,10 +506,28 @@ usba_udc_set_selfpowered(struct usb_gadget *gadget, int is_selfpowered) return 0; } +static int usba_udc_pullup(struct usb_gadget *gadget, int is_on) +{ + struct usba_udc *udc = to_usba_udc(gadget); + u32 ctrl; + + ctrl = usba_readl(udc, CTRL); + + if (is_on) + ctrl &= ~USBA_DETACH; + else + ctrl |= USBA_DETACH; + + usba_writel(udc, CTRL, ctrl); + + return 0; +} + 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 = usba_udc_pullup, }; static struct usb_endpoint_descriptor usba_ep0_desc = { From patchwork Tue Jul 23 13:18:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zixun LI X-Patchwork-Id: 1963893 X-Patchwork-Delegate: mkorpershoek@baylibre.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=hifiphile-com.20230601.gappssmtp.com header.i=@hifiphile-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=1l8Qoo4b; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WSytc21Ngz1ybY for ; Tue, 23 Jul 2024 23:39:36 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2F5928880E; Tue, 23 Jul 2024 15:36:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=hifiphile.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=hifiphile-com.20230601.gappssmtp.com header.i=@hifiphile-com.20230601.gappssmtp.com header.b="1l8Qoo4b"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B2694887B4; Tue, 23 Jul 2024 15:19:16 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,T_SPF_TEMPERROR autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) (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 A7B75887C0 for ; Tue, 23 Jul 2024 15:18:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=hifiphile.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=admin@hifiphile.com Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-427d2c8c632so39263325e9.2 for ; Tue, 23 Jul 2024 06:18:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hifiphile-com.20230601.gappssmtp.com; s=20230601; t=1721740733; x=1722345533; darn=lists.denx.de; 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=S7YGTRNAP4Qvs03ij7q9pLjWucU4FpHpqQyRMNIRFE8=; b=1l8Qoo4bR+v+ElTugbrJ79Vkr4ruI9cnWKRibReAK30xLUPKIcd9sG7nDQ3ENw8VkM sTVHAgd74xpbtDXaqDzT2cUxoTCO/X6FKYF4f7lHTzATN3VDJ3g9LYJwVD6C5MUV6m/g 6OCqAW5rqWed+T5FCzn3fhDa4FGpS6AlE1/jaU+uWpjLTudS8QW4hr5z0hIhKrY71wGY VQ4HCkG7UeA60r8e/Hr/CHsQXPacGMhAQ6CQnhIS8OMtRujS3efz85hwVegNsY6K9cI4 KdmI5J/nRN2DSkkGAHD473q/o7ZrjRwRXenz2yNctbPbTRxXYgfMs40dzNKl2kbQ56J6 e39g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721740733; x=1722345533; 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=S7YGTRNAP4Qvs03ij7q9pLjWucU4FpHpqQyRMNIRFE8=; b=ftw38QrKPnHJnIqHVAxwaMcnJW+13vn2/3MIP98f8pkms+8WtLRXajTabKXQEboOLz xoOthkN9ou0TS7OPTvVLqw10pI4nLMWNOfTLbUudP9kF/1y8kVkZn5W0Sc+GfM44bPbV uaqPNACnzGdA3wgISLvRZ8HXOD8z2O4WHpgyLiIT5jlxlioMnBp3uafNL4lQwPTx9Yx4 vifYC8Jmvop4cgzH+myoIS0t9VHQvh/Kk2vUzG3jQ2ShpGGbIDkeP8wDSh91/cMSuKIh YvdBP81UxpArDtCZk18hzOdWIWdQQbsJkkjJeCx+alLkEqliUq95Fncp7tgxycp2NLTy rlhg== X-Forwarded-Encrypted: i=1; AJvYcCWpTw8s2HkLArz/GIs8OYWFqanTE5E+BqFSP2AJI0bMSuv2lG8+UurtKjU5aL5BYnaOM+7bV4+akxb9GXj8I79Un2DlPw== X-Gm-Message-State: AOJu0YyLHunMUlHIUfTH85Z7UAK7o9i5CgGxAdPrm9ZdjAVpxOSijuph cLaoke99lG8bQSYTLpsV3ogrMeFXvUbGhkw1WO5R402OcYCg7WLmj+ed6vHB5Zo= X-Google-Smtp-Source: AGHT+IHQOCPsh7UUuCNTRch4XaOZMoAPu/3b2I7rwBwH8uMAgHwxRJbwzL54BDY3I+Znt10iO/YHiA== X-Received: by 2002:a05:600c:82c3:b0:426:5d37:67f0 with SMTP id 5b1f17b1804b1-427dc548f5bmr69203155e9.13.1721740733057; Tue, 23 Jul 2024 06:18:53 -0700 (PDT) Received: from localhost.localdomain ([78.199.60.143]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427db2a4e3bsm140312545e9.44.2024.07.23.06.18.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jul 2024 06:18:50 -0700 (PDT) From: Zixun LI X-Google-Original-From: Zixun LI To: Lukasz Majewski , Mattijs Korpershoek , Marek Vasut , Tom Rini Cc: Zixun LI , u-boot@lists.denx.de Subject: [PATCH v3 7/7] usb: gadget: atmel: Add DM_USB_GADGET support Date: Tue, 23 Jul 2024 15:18:14 +0200 Message-ID: <20240723131817.262596-8-zli@ogga.fr> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723131817.262596-1-zli@ogga.fr> References: <20240723131817.262596-1-zli@ogga.fr> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 23 Jul 2024 15:35:56 +0200 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 Add driver model support by using the uclass UCLASS_USB_GADGET_GENERIC. Disable local usb_gadget_register_driver()/usb_gadget_unregister_driver() implementation which is implemented in udc-core.c when DM_USB_GADGET is enabled. Replace dm_usb_gadget_handle_interrupts() with handle_interrupts ops when DM_USB_GADGET is enabled. Disable legacy struct usba_udc controller as controller point is extracted from udevice private data with DM. Disable legacy usba_udc_probe() to avoid conflict with DM when it's enabled. Compared to Linux driver only supported devices' DT bindings are included (sorted as Linux driver) Signed-off-by: Zixun LI --- drivers/usb/gadget/atmel_usba_udc.c | 138 ++++++++++++++++++++++++++++ drivers/usb/gadget/atmel_usba_udc.h | 3 + include/linux/usb/atmel_usba_udc.h | 2 + 3 files changed, 143 insertions(+) diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index a7b96449f8..b7b2e5196b 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c @@ -7,10 +7,14 @@ * Bo Shen */ +#include +#include #include #include #include #include +#include +#include #include #include #include @@ -18,6 +22,14 @@ #include #include +#if CONFIG_IS_ENABLED(DM_USB_GADGET) +#include + +static int usba_udc_start(struct usb_gadget *gadget, + struct usb_gadget_driver *driver); +static int usba_udc_stop(struct usb_gadget *gadget); +#endif /* CONFIG_IS_ENABLED(DM_USB_GADGET) */ + #include "atmel_usba_udc.h" static int vbus_is_present(struct usba_udc *udc) @@ -528,6 +540,10 @@ static const struct usb_gadget_ops usba_udc_ops = { .wakeup = usba_udc_wakeup, .set_selfpowered = usba_udc_set_selfpowered, .pullup = usba_udc_pullup, +#if CONFIG_IS_ENABLED(DM_USB_GADGET) + .udc_start = usba_udc_start, + .udc_stop = usba_udc_stop, +#endif }; static struct usb_endpoint_descriptor usba_ep0_desc = { @@ -1237,6 +1253,7 @@ static struct usba_ep *usba_udc_pdata(struct usba_platform_data *pdata, return eps; } +#if !CONFIG_IS_ENABLED(DM_USB_GADGET) static struct usba_udc controller = { .regs = (unsigned *)ATMEL_BASE_UDPHS, .fifo = (unsigned *)ATMEL_BASE_UDPHS_FIFO, @@ -1312,3 +1329,124 @@ int usba_udc_probe(struct usba_platform_data *pdata) return 0; } + +#else /* !CONFIG_IS_ENABLED(DM_USB_GADGET) */ +struct usba_priv_data { + struct clk_bulk clks; + struct usba_udc udc; +}; + +static int usba_udc_start(struct usb_gadget *gadget, + struct usb_gadget_driver *driver) +{ + struct usba_udc *udc = to_usba_udc(gadget); + + usba_udc_enable(udc); + + udc->driver = driver; + + return 0; +} + +static int usba_udc_stop(struct usb_gadget *gadget) +{ + struct usba_udc *udc = to_usba_udc(gadget); + + udc->driver = NULL; + + usba_udc_disable(udc); + + return 0; +} + +static int usba_udc_clk_init(struct udevice *dev, struct clk_bulk *clks) +{ + int ret; + + ret = clk_get_bulk(dev, clks); + if (ret == -ENOSYS) + return 0; + + if (ret) + return ret; + + ret = clk_enable_bulk(clks); + if (ret) { + clk_release_bulk(clks); + return ret; + } + + return 0; +} + +static int usba_udc_probe(struct udevice *dev) +{ + struct usba_priv_data *priv = dev_get_priv(dev); + struct usba_udc *udc = &priv->udc; + int ret; + + ret = usba_udc_clk_init(dev, &priv->clks); + if (ret) + return ret; + + udc->fifo = (void __iomem *)dev_remap_addr_index(dev, FIFO_IOMEM_ID); + if (!udc->fifo) + return -EINVAL; + + udc->regs = (void __iomem *)dev_remap_addr_index(dev, CTRL_IOMEM_ID); + if (!udc->regs) + return -EINVAL; + + udc->gadget.ops = &usba_udc_ops; + udc->gadget.speed = USB_SPEED_HIGH, + udc->gadget.is_dualspeed = 1, + udc->gadget.name = "atmel_usba_udc", + + udc->usba_ep = usba_udc_pdata(&pdata, udc); + + udc->driver = NULL; + + ret = usb_add_gadget_udc((struct device *)dev, &udc->gadget); + + return ret; +} + +static int usba_udc_remove(struct udevice *dev) +{ + struct usba_priv_data *priv = dev_get_priv(dev); + + usb_del_gadget_udc(&priv->udc.gadget); + + clk_release_bulk(&priv->clks); + + return dm_scan_fdt_dev(dev); +} + +static int usba_udc_handle_interrupts(struct udevice *dev) +{ + struct usba_priv_data *priv = dev_get_priv(dev); + + return usba_udc_irq(&priv->udc); +} + +static const struct usb_gadget_generic_ops usba_udc_gadget_ops = { + .handle_interrupts = usba_udc_handle_interrupts, +}; + +static const struct udevice_id usba_udc_ids[] = { + { .compatible = "atmel,at91sam9rl-udc" }, + { .compatible = "atmel,at91sam9g45-udc" }, + { .compatible = "atmel,sama5d3-udc" }, + {} +}; + +U_BOOT_DRIVER(atmel_usba_udc) = { + .name = "atmel_usba_udc", + .id = UCLASS_USB_GADGET_GENERIC, + .of_match = usba_udc_ids, + .ops = &usba_udc_gadget_ops, + .probe = usba_udc_probe, + .remove = usba_udc_remove, + .priv_auto = sizeof(struct usba_priv_data), +}; +#endif /* !CONFIG_IS_ENABLED(DM_USB_GADGET) */ diff --git a/drivers/usb/gadget/atmel_usba_udc.h b/drivers/usb/gadget/atmel_usba_udc.h index f6cb48c1cf..7f5e98f6c4 100644 --- a/drivers/usb/gadget/atmel_usba_udc.h +++ b/drivers/usb/gadget/atmel_usba_udc.h @@ -211,6 +211,9 @@ #define EP0_EPT_SIZE USBA_EPT_SIZE_64 #define EP0_NR_BANKS 1 +#define FIFO_IOMEM_ID 0 +#define CTRL_IOMEM_ID 1 + #define DBG_ERR 0x0001 /* report all error returns */ #define DBG_HW 0x0002 /* debug hardware initialization */ #define DBG_GADGET 0x0004 /* calls to/from gadget driver */ diff --git a/include/linux/usb/atmel_usba_udc.h b/include/linux/usb/atmel_usba_udc.h index c1c810759c..37c4f21849 100644 --- a/include/linux/usb/atmel_usba_udc.h +++ b/include/linux/usb/atmel_usba_udc.h @@ -20,6 +20,8 @@ struct usba_platform_data { struct usba_ep_data *ep; }; +#if !CONFIG_IS_ENABLED(DM_USB_GADGET) extern int usba_udc_probe(struct usba_platform_data *pdata); +#endif #endif /* __LINUX_USB_USBA_H */