From nobody Mon Sep 18 13:24:16 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 4Rq59X30fFz4tCFw; Mon, 18 Sep 2023 13:24:16 +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 4Rq59X2V1qz4RKP; Mon, 18 Sep 2023 13:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695043456; 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=pe3S/z+up3Y383VOe+hbwhy/CW+jBfvngZF0SU6FS+A=; b=AeJaLAT+J3p6WoiQE1MRA9/mwP71eur10WPAaOmwEHqqJKAY4sKpoztBde3MMvjJ40Kjhw 4YKrV01c8fPuuy01OuENFaHK5IYXpAr/CAvTJK1f+AUS96CrNZNtNeujjkTx0K3p9vDWwx 1s0s8ZdLGNUaAyfyYjHt+WAIOqLtO+kLwfGKH1tqX7TJseDINmNyA0scpW1+Fj9qO4MEtT 0N7nfPf7bfzmAdj1uARKloPtSzR2xp/y0/gCJebMcpg7rgBKzyPNV02KXnDSJGofnvr0GL fQG7logMeCDwR2Vp7l83vV3oT6+ypafkcu8dtxirNCMIVtXg+o0j8iv7yBbBHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695043456; a=rsa-sha256; cv=none; b=TbwzBNsHhltpKb9RLMIOoVUyGQxV8u8rWNVSPdcZE74n94FTbU+0JRaxW+vBYDVJWe5tJC r6dN9+dwdqYNAErhBpNmLVxWWSmt0r+G5AOwd9NBS8o4YrsCL75qD5exf8SmqI6fHzPwDt iq13yUYLVdHRZyMnn2KBfdu1t1lWlVU6t3TnPsR5YIMuZbiQSp18HPYdX4biSKH3lzdeiu 1VlZn2GHRYf/nhFQjf4znph2anOVk2PCRLqxXIF/OmLfL7wLkBq+Rv6+QRisQ4a2004ZRz VX91dctFtYuNw0fXAcxvntIE4LQXkcsFxZhIxaGDMrDmLUrrzutqkngUWWR7/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695043456; 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=pe3S/z+up3Y383VOe+hbwhy/CW+jBfvngZF0SU6FS+A=; b=ecbVbWEqKzn/T+u1skbqL6oWqKZ3SL/D1ftdyGZ3WVsj4GNzfac9TypOMctyf7nD09+JL9 xKPAi4nOcmEq/JruH8RPf5DlzCa+QPTMUGuFNykbbPFI73TBnnrCuAe4XqJbZvDcGvjFkp CoKRavrY6/1N7l4a2Xytud2QxNEE0DwqBE91wMLnJXjNOwEkMwtKonD8KQ/kMzkou5fcaI PHs2Pt1hzJhnRAKXFAPvv7I9PKymmhyBhzTZp6Da+QECuIm7pDOOcvK2MNg1OHB/jo5uy/ xQIQY4YV/ehiCJn2e6hHUEs290Vfhno9/clYxNNr/slIlA3EaeATMfWw5lq8SA== 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 4Rq59X1XYdzXWS; Mon, 18 Sep 2023 13:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IDOGT5097023; Mon, 18 Sep 2023 13:24:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IDOG8t097020; Mon, 18 Sep 2023 13:24:16 GMT (envelope-from git) Date: Mon, 18 Sep 2023 13:24:16 GMT Message-Id: <202309181324.38IDOG8t097020@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 0ee5d6fcfc63 - main - sdhci: fdt: Always try to get the phy and the syscon 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/main X-Git-Reftype: branch X-Git-Commit: 0ee5d6fcfc63be48fd7c1b461917dfb880dc7f72 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=0ee5d6fcfc63be48fd7c1b461917dfb880dc7f72 commit 0ee5d6fcfc63be48fd7c1b461917dfb880dc7f72 Author: Emmanuel Vadot AuthorDate: 2023-09-06 09:28:11 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-18 13:23:53 +0000 sdhci: fdt: Always try to get the phy and the syscon Per the bindings the phy and the syscon can always be present not just for RK3399. Reviewed-by: bz Differiential Revision: https://reviews.freebsd.org/D41809 Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/dev/sdhci/sdhci_fdt.c | 75 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 51 insertions(+), 24 deletions(-) diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c index 372b08a3b78a..f3a9b5091f6b 100644 --- a/sys/dev/sdhci/sdhci_fdt.c +++ b/sys/dev/sdhci/sdhci_fdt.c @@ -146,6 +146,8 @@ struct sdhci_fdt_softc { clk_t clk_ahb; /* ahb clock */ clk_t clk_core; /* core clock */ phy_t phy; /* phy to be used */ + + struct syscon *syscon; /* Handle to the syscon */ }; struct rk3399_emmccardclk_sc { @@ -299,54 +301,71 @@ sdhci_init_clocks(device_t dev) } static int -sdhci_init_rk3399(device_t dev) +sdhci_init_phy(struct sdhci_fdt_softc *sc) { - struct sdhci_fdt_softc *sc = device_get_softc(dev); - struct syscon *grf = NULL; - phandle_t node; - uint64_t freq; - uint32_t mask, val; int error; - error = clk_get_freq(sc->clk_xin, &freq); - if (error != 0) { - device_printf(dev, "cannot get xin clock frequency\n"); - return (ENXIO); - } - - /* Register clock */ - sdhci_init_rk3399_emmccardclk(dev); - /* Enable PHY */ - error = phy_get_by_ofw_name(dev, 0, "phy_arasan", &sc->phy); + error = phy_get_by_ofw_name(sc->dev, 0, "phy_arasan", &sc->phy); + if (error == ENOENT) + return (0); if (error != 0) { - device_printf(dev, "Could not get phy\n"); + device_printf(sc->dev, "Could not get phy\n"); return (ENXIO); } error = phy_enable(sc->phy); if (error != 0) { - device_printf(dev, "Could not enable phy\n"); + device_printf(sc->dev, "Could not enable phy\n"); return (ENXIO); } + + return (0); +} + +static int +sdhci_get_syscon(struct sdhci_fdt_softc *sc) +{ + phandle_t node; + /* Get syscon */ - node = ofw_bus_get_node(dev); + node = ofw_bus_get_node(sc->dev); if (OF_hasprop(node, "arasan,soc-ctl-syscon") && - syscon_get_by_ofw_property(dev, node, - "arasan,soc-ctl-syscon", &grf) != 0) { - device_printf(dev, "cannot get grf driver handle\n"); + syscon_get_by_ofw_property(sc->dev, node, + "arasan,soc-ctl-syscon", &sc->syscon) != 0) { + device_printf(sc->dev, "cannot get syscon handle\n"); return (ENXIO); } + return (0); +} + +static int +sdhci_init_rk3399(device_t dev) +{ + struct sdhci_fdt_softc *sc = device_get_softc(dev); + uint64_t freq; + uint32_t mask, val; + int error; + + error = clk_get_freq(sc->clk_xin, &freq); + if (error != 0) { + device_printf(dev, "cannot get xin clock frequency\n"); + return (ENXIO); + } + + /* Register clock */ + sdhci_init_rk3399_emmccardclk(dev); + /* Disable clock multiplier */ mask = RK3399_CORECFG_CLOCKMULTIPLIER; val = 0; - SYSCON_WRITE_4(grf, RK3399_GRF_EMMCCORE_CON11, (mask << 16) | val); + SYSCON_WRITE_4(sc->syscon, RK3399_GRF_EMMCCORE_CON11, (mask << 16) | val); /* Set base clock frequency */ mask = RK3399_CORECFG_BASECLKFREQ; val = SHIFTIN((freq + (1000000 / 2)) / 1000000, RK3399_CORECFG_BASECLKFREQ); - SYSCON_WRITE_4(grf, RK3399_GRF_EMMCCORE_CON0, (mask << 16) | val); + SYSCON_WRITE_4(sc->syscon, RK3399_GRF_EMMCCORE_CON0, (mask << 16) | val); return (0); } @@ -593,6 +612,14 @@ sdhci_fdt_attach(device_t dev) device_printf(dev, "Cannot init clocks\n"); return (err); } + if ((err = sdhci_init_phy(sc)) != 0) { + device_printf(dev, "Cannot init phy\n"); + return (err); + } + if ((err = sdhci_get_syscon(sc)) != 0) { + device_printf(dev, "Cannot get syscon handle\n"); + return (err); + } if (compat == SDHCI_FDT_RK3399) { err = sdhci_init_rk3399(dev); if (err != 0) {