git: 62b14a75310b - stable/14 - sdhci: fdt: Always try to get the phy and the syscon

The branch stable/14 has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=62b14a75310be97c13eafb236447bbf2ef54f357

commit 62b14a75310be97c13eafb236447bbf2ef54f357
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2023-09-06 09:28:11 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
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) {