From patchwork Tue Jan 17 09:11:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 643396 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp1050370pvb; Tue, 17 Jan 2023 01:12:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXtivhe/InxrR49JDNZcF1GJhDdDpVE10rur4reUG4MymRodAGtPsj/eMpqy6qDtlmY9v9CW X-Received: by 2002:aca:41c5:0:b0:365:3e3:c8d6 with SMTP id o188-20020aca41c5000000b0036503e3c8d6mr845639oia.9.1673946735311; Tue, 17 Jan 2023 01:12:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673946735; cv=none; d=google.com; s=arc-20160816; b=0a4jQTDhfrYDx6FVcEZQsDtZhH5iILaQmUbqeOxZW7IRsyzI2LacFt3Ab55VLLf22x 4uXc0ozkSIKcGPt2VmTEPhAs24he+Tjn8DJSDU1FHZl1Xs+47Z9Vz+3wRuv1G5jAyxF6 VWwFzpcJ+H5hd6Y8P369JAMBlgwilljVxHuxpvxBcpO9Xirsg6q9AMJnLgW/N2D0nJ7t jIc/GjwGvSFL1lGQJyYV8idS/a30RUkb6ktmJLtIB7oBNmvvgUoCNF/+mMl0xo2o6J04 jFR6FWjrIsg+WcuI5vlE8PDDT6QUVvi/j08WnForGnLTqTs+99Evs9Y0Qo/jcGeH8BaY yMbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:cc:to:in-reply-to:references :message-id:content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=5eDO8coD4YDnAYZyi8dwFLbs2H58cSViybgQ0P3IFyQ=; b=Rjsd4XUMb0PLLKC/i1L39B5Qolg2GVARljRcLVpCsY51a+6LWCgFX1BEe7QLOd9VK6 HQHMaL5pXIlW7c8Ac+ZbYtb/wg0TAt2Vt4nLhJ+4yMrm7mWgMzXs7z1e8rQu/1QrWjxa g0LAoiemqoS1zd0HK5Eg1LQWb6SSzfOF4Rgwm8MAVImOwXQyXNRqRO59j8yU7NWczCFb aV9qWtkRG78n12KMmeKXrXcZgLdNjXp2KxFi/mjP2fnBvU1YadX2RAK6Pg2wdR5nYBSL q0gcxwH3vedB3/coV2lAiSSxbr4EO8ClAl6xSsuJ/26MtcHetPNy8vaX6v+cY4zitb9O w8mg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=o0S1gx3o; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id h64-20020aca3a43000000b00364550964f9si12949083oia.259.2023.01.17.01.12.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 01:12:15 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=o0S1gx3o; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CFFAC85527; Tue, 17 Jan 2023 10:11:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="o0S1gx3o"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B327381BBF; Tue, 17 Jan 2023 10:11:54 +0100 (CET) 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,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) (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 F237D8555D for ; Tue, 17 Jan 2023 10:11:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=neil.armstrong@linaro.org Received: by mail-wm1-x336.google.com with SMTP id c4-20020a1c3504000000b003d9e2f72093so20465830wma.1 for ; Tue, 17 Jan 2023 01:11:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=5eDO8coD4YDnAYZyi8dwFLbs2H58cSViybgQ0P3IFyQ=; b=o0S1gx3oBv3Mi9H5rDrMVYzHcVq5bJehpHmQUx2UGepHVLI56GLHIGLJtPMwxu3CJJ N2GvkQbbZepBaIlrh9OH/IyQ3cGGgmqSs/QW9jLknCu4ECBWZVx3V8kBKsfQYDfkDiPM 4lDy74G8dO9dgihPRsVvDHGtTCyHnkMb+rI64SIRSVia9G28PbgT/HUlUXrNsGVknGKL xeKG+aOxNCnpA4Em8i2PDUkGIvAWufYAMl72Ugxwg34vwdcpR6LzWkjFBchGy2KErXQV H1/hAQ/WkZv5/x1q+nstKbkPNmI/1MXMa4a8EsDPvD4Zk/T2QDIJdlDGCLXQXDOplRGF 8lJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5eDO8coD4YDnAYZyi8dwFLbs2H58cSViybgQ0P3IFyQ=; b=U3tw7lcmR7hmYBDLhGFgxmip98wp1m+aW2YXKH7CRiTqGDLjiPmEBRlypBINRaeWy7 p0fpav4mBJhgSt3NwgjhCORDFIpOF62gtcHBN4P9gMo3zfPLELV2/CxDFZK+UpM+mnBp NePwNl3mEysszA/U80ijn5ftvIId3lS92QfgVgeKzF59tQhGSZkeek/pj/ehERafqiC8 qWKm34UelOx5Kt5USxKhEESzq275ZWHpt62LcRJUKLL1BxmjR9BH9f+l6xUDl0KYjzQ5 3EhvQ4FrLriXegmWvN+zPHkBheRFThJGk5T2XQmMyWVpfCPXv8fw0V+rxn0DpWZQRNIa U5LQ== X-Gm-Message-State: AFqh2ko2BhhMxk2iiyHY0HULNAlaPbhP+Mle12pTOYrxPX1vKl1qW0HJ DGcC8S/EIlx764TTvkmmUNTQzPvGELy82zQO X-Received: by 2002:a05:600c:1c02:b0:3d2:3b8d:21e5 with SMTP id j2-20020a05600c1c0200b003d23b8d21e5mr2304367wms.14.1673946709535; Tue, 17 Jan 2023 01:11:49 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id u21-20020a7bc055000000b003d9aa76dc6asm47969334wmc.0.2023.01.17.01.11.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 01:11:49 -0800 (PST) From: Neil Armstrong Date: Tue, 17 Jan 2023 10:11:45 +0100 Subject: [PATCH 1/2] usb: dwc3-meson-gxl: force mode on child add/removal MIME-Version: 1.0 Message-Id: <20230117-u-boot-usb-gxl-otg-dm-v1-1-2853f6d75b06@linaro.org> References: <20230117-u-boot-usb-gxl-otg-dm-v1-0-2853f6d75b06@linaro.org> In-Reply-To: <20230117-u-boot-usb-gxl-otg-dm-v1-0-2853f6d75b06@linaro.org> To: Marek Vasut , Vyacheslav Bocharov Cc: u-boot-amlogic@groups.io, u-boot@lists.denx.de, Mattijs Korpershoek , Neil Armstrong X-Mailer: b4 0.11.1 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.6 at phobos.denx.de X-Virus-Status: Clean arch/mach-meson has some custom usb logic, in particular: * on board_usb_init(), we force USB_DR_MODE_PERIPHERAL * on board_usb_cleanup(), we force USB_DR_MODE_HOST With DM_USB_GADGET=y, board_usb_init/cleanup() are no longer used when we call usb_gadget_initialize(). Instead, the generic (from udc-uclass) initialization/release is called, which itself calls the controller driver's probe()/remove(). Therefore, enabling DM_USB_GADGET=y will mean that this mode switching will break. To prepare for enabling DM_USB_GADGET, perform the mode switching when the "amlogic,meson-g12a-usb" (dwc2) driver is probed()/removed() instead. This is achieved via the glue driver, which gets notified each time one of its children is probed()/removed. Note: this change should be harmless without DM_USB_GADGET=y because the amlogic-g12a-usb driver is not probed via driver model. Thanks for Mattijs for the original work at [1]. [1] https://lore.kernel.org/all/20221024-meson-dm-usb-v1-1-2ab077a503b9@baylibre.com/ Signed-off-by: Neil Armstrong Reviewed-by: Mattijs Korpershoek Reviewed-by: Marek Vasut --- drivers/usb/dwc3/dwc3-meson-gxl.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/usb/dwc3/dwc3-meson-gxl.c b/drivers/usb/dwc3/dwc3-meson-gxl.c index 6c6d463203..d56f2747b6 100644 --- a/drivers/usb/dwc3/dwc3-meson-gxl.c +++ b/drivers/usb/dwc3/dwc3-meson-gxl.c @@ -408,6 +408,22 @@ static int dwc3_meson_gxl_remove(struct udevice *dev) return dm_scan_fdt_dev(dev); } +static int dwc3_meson_gxl_child_pre_probe(struct udevice *dev) +{ + if (ofnode_device_is_compatible(dev_ofnode(dev), "amlogic,meson-g12a-usb")) + return dwc3_meson_gxl_force_mode(dev->parent, USB_DR_MODE_PERIPHERAL); + + return 0; +} + +static int dwc3_meson_gxl_child_post_remove(struct udevice *dev) +{ + if (ofnode_device_is_compatible(dev_ofnode(dev), "amlogic,meson-g12a-usb")) + return dwc3_meson_gxl_force_mode(dev->parent, USB_DR_MODE_HOST); + + return 0; +} + static const struct udevice_id dwc3_meson_gxl_ids[] = { { .compatible = "amlogic,meson-axg-usb-ctrl" }, { .compatible = "amlogic,meson-gxl-usb-ctrl" }, @@ -421,6 +437,8 @@ U_BOOT_DRIVER(dwc3_generic_wrapper) = { .of_match = dwc3_meson_gxl_ids, .probe = dwc3_meson_gxl_probe, .remove = dwc3_meson_gxl_remove, + .child_pre_probe = dwc3_meson_gxl_child_pre_probe, + .child_post_remove = dwc3_meson_gxl_child_post_remove, .plat_auto = sizeof(struct dwc3_meson_gxl), }; From patchwork Tue Jan 17 09:11:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 643397 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp1050447pvb; Tue, 17 Jan 2023 01:12:26 -0800 (PST) X-Google-Smtp-Source: AMrXdXusIo70O/wE2QDrWApQW4gMKVz96m7NjZIrlqW+jQ+4hH6OOA07+lIKrW7jKjM59lNPJHFd X-Received: by 2002:aca:bf0b:0:b0:360:d2eb:47c6 with SMTP id p11-20020acabf0b000000b00360d2eb47c6mr923512oif.8.1673946746136; Tue, 17 Jan 2023 01:12:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673946746; cv=none; d=google.com; s=arc-20160816; b=Ukd0TlICH0YJm2O1OYEp9TMjmlhC3vk2Rk9FQM6+GxREgO4HCD/d9TSVc39AhSxb6X o4O3OhnyQJxOkshaEV+f3xBC1ohSbDovM0AKyK3eUVDU6f5UG2T9o3eicmLPn9GF0MoC TgnkBkqHVlJQWz0PFlLTbCkK2k5+s7CQvSw6x5/kPninNNOTSnNrir9Q0vsB914DXl/S gLcXODh1viQfsBRz0seD7ILXLDfqPZPlMvRFuFrzumBY8ldFWW0HL2yQdb+UK/APwqVL jVAx//KYWloFPiAZdpdbBdjNgn9S2jdD0U1kM9xVwSRfwYEzEILdJ5NNDaoX3sUM/iNQ CF/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:cc:to:in-reply-to:references :message-id:content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=M7vh9JV654cNb4XByu9Y+K0Mf44Rfv8d+9YzfnQCpOI=; b=TesLQ37DkTj2PtSUqpSIQsOoeyyKUpLI/Q9zwf7l7ijbcZU5apgB/6K4PwEGVceTsE WsonywKqvWasYMUSBzFp43fsRjmkXrwYQaSWZN5yie34RQgpAZh7wwqbQxyZldzgW0Oq ZdEg1O+WlKC4QQ5MsDx7UTxPW9ixjreUfrmyzYlzcIWEKsK49cBhQs26xlBsNgLAlfua rX2QJzD02mYJ9ah7wZQJijc/pj5kMpSwCCX6iK43k9GGyiVl398q6P7Z+VaGH29MSXvq 32rEO7Yh8nZD7JDCsF+hh5zeiv1YOSflHEVmVsMSlJxfOeisI9pUGlsQN0TKqjB30LxQ 7GHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=s8zveUT2; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id n133-20020acaef8b000000b00354894bca62si28607736oih.79.2023.01.17.01.12.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 01:12:26 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=s8zveUT2; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 819B18559B; Tue, 17 Jan 2023 10:12:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="s8zveUT2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E906780F95; Tue, 17 Jan 2023 10:11:55 +0100 (CET) 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,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) (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 023B98559B for ; Tue, 17 Jan 2023 10:11:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=neil.armstrong@linaro.org Received: by mail-wm1-x333.google.com with SMTP id o17-20020a05600c511100b003db021ef437so2521640wms.4 for ; Tue, 17 Jan 2023 01:11:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=M7vh9JV654cNb4XByu9Y+K0Mf44Rfv8d+9YzfnQCpOI=; b=s8zveUT24174F/1sRoKRx6sa+xGY0s3tZArZpTOscpAa4+ZzexpqZTHlEjNArWH8h1 oj53IL2YC31+UFaJ8TQ8Iq1EZxXCOq7mSnwVp6VuA173Kn95P5npIH986aAy9noJkJBH Wo0f7KwTLTT+R8OYQN5WGFKSR3DF00LJR8Ug9knOF/X4Pdo72zL34tsyup9YcDkcOtsP cMs4xzAN9P2TcDfmHugFGpx27KX2blTAeVdoQGxxX5+7y0NdFSI9WkB/kRfU2kEy0yua JI8WSIh8lLzGrcOE0fLhhnTaZSw+B7NU5+LZxe88z5OmS2ley8vyo7xH9OyU0tJioo8i fKQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=M7vh9JV654cNb4XByu9Y+K0Mf44Rfv8d+9YzfnQCpOI=; b=fnmANIs4VeUMTRMlw9UnZBdplj0BfYLXP5NORgWMcSlnrCnmwDQTZgZje8Lz1XoH7/ eseYiH5WD0jHX3cxJepIY+llZxt4jOge1oATxTCSDGpXbPvU1fxdaIZE9euG2kmU7dvr 2+swGaD/52xTXgURSCiCwtV5ushVdEz2y3UIiJDwlaYRbl6buOlem+gvK2qAMjbNpFd8 /GvI/bjR6Vy4rejavN8kFsCez+egrOeldorSRjblmo/ZcZwWQHM4mPE5zautoxI45+6E hy2MW7eOZgGqsctEHjU3Dok8J17L3FXkKQZajQXJcSi+3ZiJSXdSVszx284LVdOInNP8 QUEA== X-Gm-Message-State: AFqh2kr6lbKSUtD3RL6syfhQZFADZ3xj4Ta6N0ONiOkXCkgxIVu28VV0 llC5IAkeOaJyrPh1d43HqG70n+kjhsgjdMnO X-Received: by 2002:a05:600c:2056:b0:3db:ce8:6662 with SMTP id p22-20020a05600c205600b003db0ce86662mr119203wmg.31.1673946710290; Tue, 17 Jan 2023 01:11:50 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id u21-20020a7bc055000000b003d9aa76dc6asm47969334wmc.0.2023.01.17.01.11.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 01:11:49 -0800 (PST) From: Neil Armstrong Date: Tue, 17 Jan 2023 10:11:46 +0100 Subject: [PATCH 2/2] ARM: meson: switch AXG & GX dwc2 otg to DM MIME-Version: 1.0 Message-Id: <20230117-u-boot-usb-gxl-otg-dm-v1-2-2853f6d75b06@linaro.org> References: <20230117-u-boot-usb-gxl-otg-dm-v1-0-2853f6d75b06@linaro.org> In-Reply-To: <20230117-u-boot-usb-gxl-otg-dm-v1-0-2853f6d75b06@linaro.org> To: Marek Vasut , Vyacheslav Bocharov Cc: u-boot-amlogic@groups.io, u-boot@lists.denx.de, Mattijs Korpershoek , Neil Armstrong X-Mailer: b4 0.11.1 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.6 at phobos.denx.de X-Virus-Status: Clean With CONFIG_DM_USB_GADGET=y, we no longer need any board_usb_*() logic because: * the dwc2 driver is DM compatible, and handles its own clock enabling * the dwc3-meson-gxl glue drivers handles "force mode switching" Remove all mach-meson gx & axg usb code and enable CONFIG_DM_USB_GADGET. Note: Only configs having both CONFIG_USB_DWC3_MESON_GXL=y *and* USB_GADGET_DWC2_OTG=y have been updated. Thanks for the original work from Mattijs at [1] [1] https://lore.kernel.org/all/20221024-meson-dm-usb-v1-2-2ab077a503b9@baylibre.com/ Signed-off-by: Neil Armstrong Reviewed-by: Mattijs Korpershoek --- arch/arm/mach-meson/board-axg.c | 129 --------------------------------- arch/arm/mach-meson/board-gx.c | 137 ----------------------------------- configs/jethub_j100_defconfig | 1 + configs/jethub_j80_defconfig | 1 + configs/khadas-vim2_defconfig | 1 + configs/khadas-vim_defconfig | 1 + configs/libretech-ac_defconfig | 1 + configs/libretech-cc_defconfig | 1 + configs/libretech-s905d-pc_defconfig | 1 + configs/libretech-s912-pc_defconfig | 1 + configs/s400_defconfig | 1 + configs/wetek-core2_defconfig | 1 + 12 files changed, 10 insertions(+), 266 deletions(-) diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c index 236ec81579..fdf18752cd 100644 --- a/arch/arm/mach-meson/board-axg.c +++ b/arch/arm/mach-meson/board-axg.c @@ -15,12 +15,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include DECLARE_GLOBAL_DATA_PTR; @@ -90,126 +84,3 @@ static struct mm_region axg_mem_map[] = { }; struct mm_region *mem_map = axg_mem_map; - -#if CONFIG_IS_ENABLED(USB_DWC3_MESON_GXL) && \ - CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) -static struct dwc2_plat_otg_data meson_gx_dwc2_data; - -int board_usb_init(int index, enum usb_init_type init) -{ - struct fdtdec_phandle_args args; - const void *blob = gd->fdt_blob; - int node, dwc2_node; - struct udevice *dev, *clk_dev; - struct clk clk; - int ret; - - /* find the usb glue node */ - node = fdt_node_offset_by_compatible(blob, -1, - "amlogic,meson-axg-usb-ctrl"); - if (node < 0) { - debug("Not found usb-control node\n"); - return -ENODEV; - } - - if (!fdtdec_get_is_enabled(blob, node)) { - debug("usb is disabled in the device tree\n"); - return -ENODEV; - } - - ret = uclass_get_device_by_of_offset(UCLASS_SIMPLE_BUS, node, &dev); - if (ret) { - debug("Not found usb-control device\n"); - return ret; - } - - /* find the dwc2 node */ - dwc2_node = fdt_node_offset_by_compatible(blob, node, - "amlogic,meson-g12a-usb"); - if (dwc2_node < 0) { - debug("Not found dwc2 node\n"); - return -ENODEV; - } - - if (!fdtdec_get_is_enabled(blob, dwc2_node)) { - debug("dwc2 is disabled in the device tree\n"); - return -ENODEV; - } - - meson_gx_dwc2_data.regs_otg = fdtdec_get_addr(blob, dwc2_node, "reg"); - if (meson_gx_dwc2_data.regs_otg == FDT_ADDR_T_NONE) { - debug("usbotg: can't get base address\n"); - return -ENODATA; - } - - /* Enable clock */ - ret = fdtdec_parse_phandle_with_args(blob, dwc2_node, "clocks", - "#clock-cells", 0, 0, &args); - if (ret) { - debug("usbotg has no clocks defined in the device tree\n"); - return ret; - } - - ret = uclass_get_device_by_of_offset(UCLASS_CLK, args.node, &clk_dev); - if (ret) - return ret; - - if (args.args_count != 1) { - debug("Can't find clock ID in the device tree\n"); - return -ENODATA; - } - - clk.dev = clk_dev; - clk.id = args.args[0]; - - ret = clk_enable(&clk); - if (ret) { - debug("Failed to enable usbotg clock\n"); - return ret; - } - - meson_gx_dwc2_data.rx_fifo_sz = fdtdec_get_int(blob, dwc2_node, - "g-rx-fifo-size", 0); - meson_gx_dwc2_data.np_tx_fifo_sz = fdtdec_get_int(blob, dwc2_node, - "g-np-tx-fifo-size", 0); - meson_gx_dwc2_data.tx_fifo_sz = fdtdec_get_int(blob, dwc2_node, - "g-tx-fifo-size", 0); - - /* Switch to peripheral mode */ - ret = dwc3_meson_gxl_force_mode(dev, USB_DR_MODE_PERIPHERAL); - if (ret) - return ret; - - return dwc2_udc_probe(&meson_gx_dwc2_data); -} - -int board_usb_cleanup(int index, enum usb_init_type init) -{ - const void *blob = gd->fdt_blob; - struct udevice *dev; - int node; - int ret; - - /* find the usb glue node */ - node = fdt_node_offset_by_compatible(blob, -1, - "amlogic,meson-axg-usb-ctrl"); - if (node < 0) { - debug("Not found usb-control node\n"); - return -ENODEV; - } - - if (!fdtdec_get_is_enabled(blob, node)) - return -ENODEV; - - ret = uclass_get_device_by_of_offset(UCLASS_SIMPLE_BUS, node, &dev); - if (ret) - return ret; - - /* Switch to OTG mode */ - ret = dwc3_meson_gxl_force_mode(dev, USB_DR_MODE_HOST); - if (ret) - return ret; - - return 0; -} -#endif diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c index 01fafd81c4..f28f84d86f 100644 --- a/arch/arm/mach-meson/board-gx.c +++ b/arch/arm/mach-meson/board-gx.c @@ -16,12 +16,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include DECLARE_GLOBAL_DATA_PTR; @@ -108,134 +102,3 @@ static struct mm_region gx_mem_map[] = { }; struct mm_region *mem_map = gx_mem_map; - -#if CONFIG_IS_ENABLED(USB_DWC3_MESON_GXL) && \ - CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) -static struct dwc2_plat_otg_data meson_gx_dwc2_data; - -int board_usb_init(int index, enum usb_init_type init) -{ - struct fdtdec_phandle_args args; - const void *blob = gd->fdt_blob; - int node, dwc2_node; - struct udevice *dev, *clk_dev; - struct clk clk; - int ret; - - /* find the usb glue node */ - node = fdt_node_offset_by_compatible(blob, -1, - "amlogic,meson-gxl-usb-ctrl"); - if (node < 0) { - node = fdt_node_offset_by_compatible(blob, -1, - "amlogic,meson-gxm-usb-ctrl"); - if (node < 0) { - debug("Not found usb-control node\n"); - return -ENODEV; - } - } - - if (!fdtdec_get_is_enabled(blob, node)) { - debug("usb is disabled in the device tree\n"); - return -ENODEV; - } - - ret = uclass_get_device_by_of_offset(UCLASS_SIMPLE_BUS, node, &dev); - if (ret) { - debug("Not found usb-control device\n"); - return ret; - } - - /* find the dwc2 node */ - dwc2_node = fdt_node_offset_by_compatible(blob, node, - "amlogic,meson-g12a-usb"); - if (dwc2_node < 0) { - debug("Not found dwc2 node\n"); - return -ENODEV; - } - - if (!fdtdec_get_is_enabled(blob, dwc2_node)) { - debug("dwc2 is disabled in the device tree\n"); - return -ENODEV; - } - - meson_gx_dwc2_data.regs_otg = fdtdec_get_addr(blob, dwc2_node, "reg"); - if (meson_gx_dwc2_data.regs_otg == FDT_ADDR_T_NONE) { - debug("usbotg: can't get base address\n"); - return -ENODATA; - } - - /* Enable clock */ - ret = fdtdec_parse_phandle_with_args(blob, dwc2_node, "clocks", - "#clock-cells", 0, 0, &args); - if (ret) { - debug("usbotg has no clocks defined in the device tree\n"); - return ret; - } - - ret = uclass_get_device_by_of_offset(UCLASS_CLK, args.node, &clk_dev); - if (ret) - return ret; - - if (args.args_count != 1) { - debug("Can't find clock ID in the device tree\n"); - return -ENODATA; - } - - clk.dev = clk_dev; - clk.id = args.args[0]; - - ret = clk_enable(&clk); - if (ret) { - debug("Failed to enable usbotg clock\n"); - return ret; - } - - meson_gx_dwc2_data.rx_fifo_sz = fdtdec_get_int(blob, dwc2_node, - "g-rx-fifo-size", 0); - meson_gx_dwc2_data.np_tx_fifo_sz = fdtdec_get_int(blob, dwc2_node, - "g-np-tx-fifo-size", 0); - meson_gx_dwc2_data.tx_fifo_sz = fdtdec_get_int(blob, dwc2_node, - "g-tx-fifo-size", 0); - - /* Switch to peripheral mode */ - ret = dwc3_meson_gxl_force_mode(dev, USB_DR_MODE_PERIPHERAL); - if (ret) - return ret; - - return dwc2_udc_probe(&meson_gx_dwc2_data); -} - -int board_usb_cleanup(int index, enum usb_init_type init) -{ - const void *blob = gd->fdt_blob; - struct udevice *dev; - int node; - int ret; - - /* find the usb glue node */ - node = fdt_node_offset_by_compatible(blob, -1, - "amlogic,meson-gxl-usb-ctrl"); - if (node < 0) { - node = fdt_node_offset_by_compatible(blob, -1, - "amlogic,meson-gxm-usb-ctrl"); - if (node < 0) { - debug("Not found usb-control node\n"); - return -ENODEV; - } - } - - if (!fdtdec_get_is_enabled(blob, node)) - return -ENODEV; - - ret = uclass_get_device_by_of_offset(UCLASS_SIMPLE_BUS, node, &dev); - if (ret) - return ret; - - /* Switch to OTG mode */ - ret = dwc3_meson_gxl_force_mode(dev, USB_DR_MODE_HOST); - if (ret) - return ret; - - return 0; -} -#endif diff --git a/configs/jethub_j100_defconfig b/configs/jethub_j100_defconfig index c2651580f8..dac775bd3b 100644 --- a/configs/jethub_j100_defconfig +++ b/configs/jethub_j100_defconfig @@ -55,6 +55,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC2=y diff --git a/configs/jethub_j80_defconfig b/configs/jethub_j80_defconfig index f3c47a001a..1d11a961b9 100644 --- a/configs/jethub_j80_defconfig +++ b/configs/jethub_j80_defconfig @@ -59,6 +59,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC2=y diff --git a/configs/khadas-vim2_defconfig b/configs/khadas-vim2_defconfig index a8d11a83c9..3af6b446ec 100644 --- a/configs/khadas-vim2_defconfig +++ b/configs/khadas-vim2_defconfig @@ -59,6 +59,7 @@ CONFIG_MESON_SPIFC=y CONFIG_SYSINFO=y CONFIG_SYSINFO_SMBIOS=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/khadas-vim_defconfig b/configs/khadas-vim_defconfig index d1ed45ff88..6bb2200a6b 100644 --- a/configs/khadas-vim_defconfig +++ b/configs/khadas-vim_defconfig @@ -50,6 +50,7 @@ CONFIG_MESON_SERIAL=y CONFIG_SYSINFO=y CONFIG_SYSINFO_SMBIOS=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/libretech-ac_defconfig b/configs/libretech-ac_defconfig index a333106692..2f44771a84 100644 --- a/configs/libretech-ac_defconfig +++ b/configs/libretech-ac_defconfig @@ -65,6 +65,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_MESON_SPIFC=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/libretech-cc_defconfig b/configs/libretech-cc_defconfig index 60b40e6270..05311d8e08 100644 --- a/configs/libretech-cc_defconfig +++ b/configs/libretech-cc_defconfig @@ -49,6 +49,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/libretech-s905d-pc_defconfig b/configs/libretech-s905d-pc_defconfig index d3e600ec02..4e3aee7542 100644 --- a/configs/libretech-s905d-pc_defconfig +++ b/configs/libretech-s905d-pc_defconfig @@ -61,6 +61,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_MESON_SPIFC=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/libretech-s912-pc_defconfig b/configs/libretech-s912-pc_defconfig index 8b4f052d08..c9ceb35ff6 100644 --- a/configs/libretech-s912-pc_defconfig +++ b/configs/libretech-s912-pc_defconfig @@ -60,6 +60,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_MESON_SPIFC=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/s400_defconfig b/configs/s400_defconfig index 827bd548c7..91930d7f48 100644 --- a/configs/s400_defconfig +++ b/configs/s400_defconfig @@ -42,6 +42,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/wetek-core2_defconfig b/configs/wetek-core2_defconfig index 13940dd56f..b730700630 100644 --- a/configs/wetek-core2_defconfig +++ b/configs/wetek-core2_defconfig @@ -51,6 +51,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y