From owner-svn-src-all@freebsd.org Wed Jan 29 09:36:59 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E03071D128E; Wed, 29 Jan 2020 09:36:59 +0000 (UTC) (envelope-from ganbold@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 486z0C5Zbcz4MmP; Wed, 29 Jan 2020 09:36:59 +0000 (UTC) (envelope-from ganbold@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B66679FFD; Wed, 29 Jan 2020 09:36:59 +0000 (UTC) (envelope-from ganbold@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00T9axMA066159; Wed, 29 Jan 2020 09:36:59 GMT (envelope-from ganbold@FreeBSD.org) Received: (from ganbold@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00T9axp3066158; Wed, 29 Jan 2020 09:36:59 GMT (envelope-from ganbold@FreeBSD.org) Message-Id: <202001290936.00T9axp3066158@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ganbold set sender to ganbold@FreeBSD.org using -f From: Ganbold Tsagaankhuu Date: Wed, 29 Jan 2020 09:36:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357252 - head/sys/arm64/rockchip X-SVN-Group: head X-SVN-Commit-Author: ganbold X-SVN-Commit-Paths: head/sys/arm64/rockchip X-SVN-Commit-Revision: 357252 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jan 2020 09:36:59 -0000 Author: ganbold Date: Wed Jan 29 09:36:59 2020 New Revision: 357252 URL: https://svnweb.freebsd.org/changeset/base/357252 Log: Enable USB3 support for Rockchip RK3328 SoC. Reviewed by: manu Modified: head/sys/arm64/rockchip/rk_dwc3.c Modified: head/sys/arm64/rockchip/rk_dwc3.c ============================================================================== --- head/sys/arm64/rockchip/rk_dwc3.c Wed Jan 29 09:33:40 2020 (r357251) +++ head/sys/arm64/rockchip/rk_dwc3.c Wed Jan 29 09:36:59 2020 (r357252) @@ -54,8 +54,14 @@ __FBSDID("$FreeBSD$"); #include #include +enum rk_dwc3_type { + RK3328 = 1, + RK3399, +}; + static struct ofw_compat_data compat_data[] = { - { "rockchip,rk3399-dwc3", 1 }, + { "rockchip,rk3328-dwc3", RK3328 }, + { "rockchip,rk3399-dwc3", RK3399 }, { NULL, 0 } }; @@ -69,6 +75,7 @@ struct rk_dwc3_softc { clk_t clk_usb3; clk_t clk_grf; hwreset_t rst_usb3; + enum rk_dwc3_type type; }; static int @@ -102,6 +109,7 @@ rk_dwc3_attach(device_t dev) sc = device_get_softc(dev); sc->dev = dev; node = ofw_bus_get_node(dev); + sc->type = ofw_bus_search_compatible(dev, compat_data)->ocd_data; /* Mandatory clocks */ if (clk_get_by_ofw_name(dev, 0, "ref_clk", &sc->clk_ref) != 0) { @@ -134,17 +142,18 @@ rk_dwc3_attach(device_t dev) clk_get_name(sc->clk_bus)); return (ENXIO); } - 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 (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); + } + err = clk_enable(sc->clk_grf); + if (err != 0) { + device_printf(dev, "Could not enable clock %s\n", + clk_get_name(sc->clk_grf)); + return (ENXIO); + } } - err = clk_enable(sc->clk_grf); - if (err != 0) { - device_printf(dev, "Could not enable clock %s\n", - clk_get_name(sc->clk_grf)); - return (ENXIO); - } - /* Optional clocks */ if (clk_get_by_ofw_name(dev, 0, "aclk_usb3_rksoc_axi_perf", &sc->clk_axi_perf) == 0) { err = clk_enable(sc->clk_axi_perf);