From nobody Wed Oct 18 14:31:40 2023 X-Original-To: dev-commits-src-branches@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 4S9YFS67zLz4x63Q; Wed, 18 Oct 2023 14:31:40 +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 4S9YFS5WKPz3MnW; Wed, 18 Oct 2023 14:31:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639500; 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=UhAqqv0xAwji2eEGobtES3EeU/TtQi7pe0swNlMWyVs=; b=o9X++XpXf2Obf0h3T6DkSeMzp51wkhJkVRoFNBeVuMI6Y3l4B29Mwd9nMGSEA9IbLf9i+2 UbrqLJmXeaBj35DnOUTYn/AM8r4PC9B6XqyNHCDR/ZYDqMl5WSO1Fb+Z5C0hBYLnR7bEjQ 98tsrt4iKvxdpelcAXxEh7QIsXhtdCjxso6RcCzS1P3EjHvlbC3a6jfrfPKsj9HOANDYcS xLjUBKgIdxyxDuy9loTSpIbrH1adyPhVtE5Vbi/M9L/1ot+4ixCIo/uDmaTANr3QbOOtR7 rPep02cxg8P2lftQeYRVc0YquQcvtiRc0jsUA7zIEefzUIslmP+hG3QJ9XWpFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639500; a=rsa-sha256; cv=none; b=l2ZLgstLhr/H4c5nNFSSyQuRAArE/v8fi8B/Qm0WzpCJyWM5YNRIbxrLVjudt8TD0Ksdjx fkwZNxMe1qxKDKFB0zHfl7+d8n3+HGP+QPFeI2tQ+RcB4tBfXTL71gWAFnhIJXjhOSf/TR 6MVj8MDyFXlpm9MSO2A2Z5mr10HwaTgn7SGppbh3mPtgT2qPBszC4jY0LldkRQY/k6EL+t j3keQVBIiSCm5yVEsXn4zw71wAZPOp3qLEipGY/oIDVaq3AAnnel5W+CU7FRc5o2OUsG6Z KC/WRWZ7q0U3skEQPSJyU9MP0+31C0yOXHMLV52tQtyrAUjI7jihIsmPPQ355g== 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=1697639500; 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=UhAqqv0xAwji2eEGobtES3EeU/TtQi7pe0swNlMWyVs=; b=fgmPqBptYjuvxE6XiBrmXkhcEZmMmLv64J29OQqybV8XGYK6K71tpVJIrKJPzIt70a0wyi a6pWUbEw80Y8OolgB8u63oUN0bqjbyhIYzWem+FSQndpB8Fa0bZLXQ3E10XXzQBwXjgkdk RAlgHCrIFzkxJcvdiZ2X3agCL7SnpsCmIFYDOcPXK7EtuENGfH/+sioSamN5jLlw5OsDEj 3kUP1GrZp22K9cS+nKaSg4NRgRtJo6OwCIbKxudV9USZtqya4NfMdBKc03SC2KLFdoIE1I gohudMIU2OsE8CzY1Q4mCQN2QHYi1qGvMBxxDYtIrDZq6NcpMeqQMbt0dQeaow== 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 4S9YFS4JMPz18tv; Wed, 18 Oct 2023 14:31:40 +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 39IEVe8b089232; Wed, 18 Oct 2023 14:31:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEVevt089229; Wed, 18 Oct 2023 14:31:40 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:31:40 GMT Message-Id: <202310181431.39IEVevt089229@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: 62b14a75310b - stable/14 - sdhci: fdt: Always try to get the phy and the syscon List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 62b14a75310be97c13eafb236447bbf2ef54f357 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=62b14a75310be97c13eafb236447bbf2ef54f357 commit 62b14a75310be97c13eafb236447bbf2ef54f357 Author: Emmanuel Vadot AuthorDate: 2023-09-06 09:28:11 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:31:08 +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 (cherry picked from commit 0ee5d6fcfc63be48fd7c1b461917dfb880dc7f72) --- 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) {