From nobody Thu Feb 2 11:20:21 2023 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 4P6xCn30jxz3cx6N; Thu, 2 Feb 2023 11:20:21 +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 4P6xCn2Splz47nR; Thu, 2 Feb 2023 11:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675336821; 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=FPp/YuhrrAMWSZLcJfDSt8Jh9TReNF1elFjxmTP7stM=; b=ucjM1vucEB/vLdyPHUrTjgVS9z078X2kblMXDpSPmeLwOcdEwTJdiAWwogk9bAol/0mGVt WEFQvFE6iDawAZt4YgB8YJzFCJitJwIIedRwJHS6ZMoE+FPAjxmhblWsjc1BiH71/1tCt9 dRRl2YLgqD2tDaVlcVSroSGYemAWDaRL4cfhbxXj3X1rNI4BDy+UsewSN/FKzEHNkxRuTZ YKCuBcbHhpOc/bq3gmONolpSQ//BMBi5IHb4PNvjS7+QWthTTpwrsSxee5BusU/ESz2qno mBUsk7E4+vwl7umsLfg/CwZZsRB60pr9qoMnEPLjN6DouShpMgFcYPcFs+C8mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675336821; 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=FPp/YuhrrAMWSZLcJfDSt8Jh9TReNF1elFjxmTP7stM=; b=gwLq5mHpvTkpP5CehqBeebTiwo927eiLEERv5Y+biXB+hYVo+SHF24O4k/uw9wZWMQoTNh m/fZhdex9EnLn8SiwGsbIS3fsidhNkM6FIkTaMWiQ0Rvf66jMngN8qgb7bmwInFsQcgAVg V1E47Z53c3Z8L0Tb/FVuKoge2Is9AuAMaUnuAcdOtPO7qn7neYETQfyXFMWDhZh6Yx/Y1x GAU//6E3GsBJAgWeTAsvNjPcG75f6IhhXgLpxgKJp3j1Z563YHHqrMpcbaYYb/xe2cepBA 1zGnWk7esqN3X/0oyb6J6iDx1PkqNyPs6tLxVIQlVnbAyFS+d1X/jq6YUKT+Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675336821; a=rsa-sha256; cv=none; b=Bbs1wfOUpiJpHgv0Jd5f7d4pNTZeWaEt1WLxe21SCDmjZixpzHNGnghe1tWs4TGiTWZblm kdBS7ymLa82qKxAJulAPKOpNlPfOm4rzg0ogfxjSS8iaFgJMKbiFcm5kQYtdfMbwz51JKo /GTahkWzDC/O9Yc5mLOVAfEVwzkes6QunjxRBwlYzYBRorQ6TcV2W+H7mxWXKKk8mqjDcn B6lbQX3pXqOvG488X+6upFkO048G8NoPHhS5NMhaBx5LGIRMB9bIaw4O3CtlwEDzWSFnXo GRCyJ8ZYBBSbOdUAaZMJSHXZvB+WeoSdFCvtwPuxujiKfpo5EmNNYsfJvL7Csg== 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 4P6xCn1WYbzsR1; Thu, 2 Feb 2023 11:20:21 +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 312BKLc2085834; Thu, 2 Feb 2023 11:20:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312BKLHB085833; Thu, 2 Feb 2023 11:20:21 GMT (envelope-from git) Date: Thu, 2 Feb 2023 11:20:21 GMT Message-Id: <202302021120.312BKLHB085833@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: a412da4f9e7e - stable/13 - Add support for RockChip RK356X to DWC3 driver. For RK356x platform, we can set bit 26 of DWC3_GUCTL1 register for usb 2.0 device. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: a412da4f9e7e48067ab1cdc5986bf13497129085 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=a412da4f9e7e48067ab1cdc5986bf13497129085 commit a412da4f9e7e48067ab1cdc5986bf13497129085 Author: Søren Schmidt AuthorDate: 2022-08-16 12:24:44 +0000 Commit: Emmanuel Vadot CommitDate: 2023-02-02 11:17:19 +0000 Add support for RockChip RK356X to DWC3 driver. For RK356x platform, we can set bit 26 of DWC3_GUCTL1 register for usb 2.0 device. Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D36211 (cherry picked from commit 1331c0f44b6a3b6dec1fbd638103fa15bffac5d8) --- sys/arm64/rockchip/rk_dwc3.c | 6 +----- sys/dev/usb/controller/dwc3.c | 9 ++++++++- sys/dev/usb/controller/dwc3.h | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/sys/arm64/rockchip/rk_dwc3.c b/sys/arm64/rockchip/rk_dwc3.c index d63ba67907f8..72292e9f8902 100644 --- a/sys/arm64/rockchip/rk_dwc3.c +++ b/sys/arm64/rockchip/rk_dwc3.c @@ -141,11 +141,7 @@ rk_dwc3_attach(device_t dev) clk_get_name(sc->clk_bus)); return (ENXIO); } - if (sc->type == RK3399) { - if (clk_get_by_ofw_name(dev, 0, "grf_clk", &sc->clk_grf) != 0) { - device_printf(dev, "Cannot get grf_clk clock\n"); - return (ENXIO); - } + if (clk_get_by_ofw_name(dev, 0, "grf_clk", &sc->clk_grf) == 0) { err = clk_enable(sc->clk_grf); if (err != 0) { device_printf(dev, "Could not enable clock %s\n", diff --git a/sys/dev/usb/controller/dwc3.c b/sys/dev/usb/controller/dwc3.c index 19237ef4c11d..2e8f868bc47b 100644 --- a/sys/dev/usb/controller/dwc3.c +++ b/sys/dev/usb/controller/dwc3.c @@ -366,6 +366,7 @@ snps_dwc3_common_attach(device_t dev, bool is_fdt) #ifdef FDT phandle_t node; phy_t usb2_phy, usb3_phy; + uint32_t reg; #endif int error, rid; @@ -403,7 +404,13 @@ snps_dwc3_common_attach(device_t dev, bool is_fdt) error = phy_get_by_ofw_name(dev, node, "usb3-phy", &usb3_phy); if (error == 0 && usb3_phy != NULL) phy_enable(usb3_phy); - + else { + reg = DWC3_READ(sc, DWC3_GUCTL1); + if (bootverbose) + device_printf(dev, "Forcing USB2 clock only\n"); + reg |= DWC3_GUCTL1_DEV_FORCE_20_CLK_FOR_30_CLK; + DWC3_WRITE(sc, DWC3_GUCTL1, reg); + } snps_dwc3_configure_phy(sc, node); skip_phys: #endif diff --git a/sys/dev/usb/controller/dwc3.h b/sys/dev/usb/controller/dwc3.h index 83951d327c8c..21a87a1917ee 100644 --- a/sys/dev/usb/controller/dwc3.h +++ b/sys/dev/usb/controller/dwc3.h @@ -49,6 +49,7 @@ #define DWC3_GUCTL1 0xc11c #define DWC3_GUCTL1_TX_IPGAP_LINECHECK_DIS (1 << 28) +#define DWC3_GUCTL1_DEV_FORCE_20_CLK_FOR_30_CLK (1 << 26) #define DWC3_GSNPSID 0xc120 #define DWC3_GGPIO 0xc124