From nobody Wed Nov 16 10:58:38 2022
X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NC0Qk6Yffz4hZbB;
Wed, 16 Nov 2022 10:58:38 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4NC0Qk63g9z44Pv;
Wed, 16 Nov 2022 10:58:38 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1668596318;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=ypKeFDzBuFvUXtgh0K2x3c2E1fHaP/Kk6oZhIII8lDg=;
b=dz2GTTfVocB9JtYz+jqF0Zo0hjdVAUqpm6yiyFUZ2LVCo9awD2qVAXzhbNS++nOlOOtTD5
lgR+YeG+rYciEmla5UKjefJlikZhoikHjBYDUqKLsataNixGWq9Kgm2eGWNZHslHAsYQuy
U8Man+w5RL+mX8W9XlNQLnUvx42yIuUDBn+9eg+N3XGzk4ddVKwSjta5OH9MBeNG273nbD
eQM60+Oh0d6g9+zXefG3iYMl60LFq/5nIXY3dzko+3GX+lvu60uaVbpBTyyUnRdQQNJ/lB
EaB2jMet/RXFHq3lJeSV7EmumQI0J+sPj+hK4hQ7Xpn/DNDQMA0K9sS3xawCJg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1668596318;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=ypKeFDzBuFvUXtgh0K2x3c2E1fHaP/Kk6oZhIII8lDg=;
b=mLpWcHIkmaq2OxoCyiq75Mb1HVtnbZi8zkzGRe9apKkk80VO/AvXnbk1yqDprou5DNmgdO
Vbf2Mv3MR5umPeWg2J+n88pWiIdkaZlpHroc/tf4v11qKJkNfqPs/5tPkcFdaoqgF11vip
Q2kOuEaZbIKEEpDiU9uNn0IHdncrZw0zKLOoAbuH0m+PFkLgLpqCivSYl2cJB6WdtSn//q
a+6gbG0Zi1nvKXKpmZgKmxMT4iurZHf35M0TXqm+ywrwClZg+PXauShbv2LcTNjdHFE2gG
TLVHHladgdjMQgh3be8/iuU/S00mqv+NNCRvB3CLI8tgbBIaXalWCj5qwlvRoQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668596318; a=rsa-sha256; cv=none;
b=RJ/NarP3TGQ1qMv6jKg2l/5/i9InPlLhqvvb9kjWK4EVDiI0EHXtI3ITPfmyf5cYXkJsiE
HthxyMTE8fzvhM4fg4Wm99JALYB/eSvLKWA20ZYftCT/JqWy/Yx/y49coXjh06WTjCCu9W
6JsBZVSKBqMTk8/v02tEmDofA3orDIy6m5WB90+UGLSYQq2VmXxSPj6jCfOOPAF679USLA
rSFuXZi/8a8z0LlfLLed0OnaNSJvqIQOKy8MYcmjv6WUVF3eOA5DmYfSB2qPU3dmDNP2TU
oRm+pX8neaeg+fJy8HhcoVBARXMeKAyDakVct3Bl9VSAgW0ZnEfaeZuLaQxuow==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NC0Qk57KDz10DB;
Wed, 16 Nov 2022 10:58:38 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AGAwcUw094673;
Wed, 16 Nov 2022 10:58:38 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AGAwcTA094672;
Wed, 16 Nov 2022 10:58:38 GMT
(envelope-from git)
Date: Wed, 16 Nov 2022 10:58:38 GMT
Message-Id: <202211161058.2AGAwcTA094672@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 0a5f342aa5a0 - main - dwc3: Handle optional clocks
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-all@freebsd.org
X-BeenThere: dev-commits-src-all@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 0a5f342aa5a0ddd5d173bdfc856c6a81d1c12c6c
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=0a5f342aa5a0ddd5d173bdfc856c6a81d1c12c6c
commit 0a5f342aa5a0ddd5d173bdfc856c6a81d1c12c6c
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-11-15 08:58:30 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2022-11-16 10:58:31 +0000
dwc3: Handle optional clocks
Usually dwc3 needs a glue node that contain the SoC specific clocks/resets.
For some reason the RK3328 DTS doesn't have this glue node and the clocks
are specified in the dwc3 node directly.
The bindings says that it is allowed but doesn't specified some strict names
for them.
Add a specific case for RK3328 based on the compatible string.
Reviewed by: andrew
Differential Revision: https://reviews.freebsd.org/D37392
Sponsored by: Beckhoff Automation GmbH & Co. KG
---
sys/dev/usb/controller/dwc3.c | 40 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 39 insertions(+), 1 deletion(-)
diff --git a/sys/dev/usb/controller/dwc3.c b/sys/dev/usb/controller/dwc3.c
index 2e8f868bc47b..eaea4d57a764 100644
--- a/sys/dev/usb/controller/dwc3.c
+++ b/sys/dev/usb/controller/dwc3.c
@@ -86,6 +86,11 @@ struct snps_dwc3_softc {
bus_space_tag_t bst;
bus_space_handle_t bsh;
uint32_t snpsid;
+#ifdef FDT
+ clk_t clk_ref;
+ clk_t clk_suspend;
+ clk_t clk_bus;
+#endif
};
#define DWC3_WRITE(_sc, _off, _val) \
@@ -394,9 +399,32 @@ snps_dwc3_common_attach(device_t dev, bool is_fdt)
if (!is_fdt)
goto skip_phys;
- /* Get the phys */
node = ofw_bus_get_node(dev);
+ /* Get the clocks if any */
+ if (ofw_bus_is_compatible(dev, "rockchip,rk3328-dwc3") == 1) {
+ if (clk_get_by_ofw_name(dev, node, "ref_clk", &sc->clk_ref) != 0)
+ device_printf(dev, "Cannot get ref_clk\n");
+ if (clk_get_by_ofw_name(dev, node, "suspend_clk", &sc->clk_suspend) != 0)
+ device_printf(dev, "Cannot get suspend_clk\n");
+ if (clk_get_by_ofw_name(dev, node, "bus_clk", &sc->clk_bus) != 0)
+ device_printf(dev, "Cannot get bus_clk\n");
+ }
+
+ if (sc->clk_ref != NULL) {
+ if (clk_enable(sc->clk_ref) != 0)
+ device_printf(dev, "Cannot enable ref_clk\n");
+ }
+ if (sc->clk_suspend != NULL) {
+ if (clk_enable(sc->clk_suspend) != 0)
+ device_printf(dev, "Cannot enable suspend_clk\n");
+ }
+ if (sc->clk_bus != NULL) {
+ if (clk_enable(sc->clk_bus) != 0)
+ device_printf(dev, "Cannot enable bus_clk\n");
+ }
+
+ /* Get the phys */
usb2_phy = usb3_phy = NULL;
error = phy_get_by_ofw_name(dev, node, "usb2-phy", &usb2_phy);
if (error == 0 && usb2_phy != NULL)
@@ -427,6 +455,16 @@ skip_phys:
snsp_dwc3_dump_regs(sc, "Post XHCI init");
#endif
+#ifdef FDT
+ if (error) {
+ if (sc->clk_ref != NULL)
+ clk_disable(sc->clk_ref);
+ if (sc->clk_suspend != NULL)
+ clk_disable(sc->clk_suspend);
+ if (sc->clk_bus != NULL)
+ clk_disable(sc->clk_bus);
+ }
+#endif
return (error);
}