Date: Mon, 7 Mar 2022 16:00:06 GMT From: Marcin Wojtas <mw@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 707ab1f0643a - stable/13 - sdhci_xenon: enable MMC FDT parsing Message-ID: <202203071600.227G06wM066382@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=707ab1f0643a13002256a772dc554d53beeecf1f commit 707ab1f0643a13002256a772dc554d53beeecf1f Author: Marcin Wojtas <mw@FreeBSD.org> AuthorDate: 2021-05-01 07:55:06 +0000 Commit: Marcin Wojtas <mw@FreeBSD.org> CommitDate: 2022-03-07 15:59:50 +0000 sdhci_xenon: enable MMC FDT parsing The mmc_fdt_parse allows to parse more MMC-related FDT properties. Start using it. "wp-inverted" property, VQMMC and newly added VMMC power supply parsing is now done in a generic code. Reviewed by: manu Obtained from: Semihalf Sponsored by: Marvell Differential Revision: https://reviews.freebsd.org/D30562 MFC after: 2 weeks (cherry picked from commit 43e31350f8f67087b641d85520e20176e152dda7) --- sys/dev/sdhci/sdhci_xenon.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/sys/dev/sdhci/sdhci_xenon.c b/sys/dev/sdhci/sdhci_xenon.c index 5afbe7afefd3..c230f0ef9752 100644 --- a/sys/dev/sdhci/sdhci_xenon.c +++ b/sys/dev/sdhci/sdhci_xenon.c @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include <dev/ofw/ofw_bus_subr.h> #include <dev/mmc/bridge.h> +#include <dev/mmc/mmc_fdt_helpers.h> #include <dev/mmc/mmcbrvar.h> #include <dev/mmc/mmcreg.h> @@ -91,12 +92,12 @@ struct sdhci_xenon_softc { struct sdhci_slot *slot; /* SDHCI internal data */ struct resource *mem_res; /* Memory resource */ - regulator_t reg_vqmmc; /* vqmmc-supply regulator */ uint8_t znr; /* PHY ZNR */ uint8_t zpr; /* PHY ZPR */ bool no_18v; /* No 1.8V support */ bool slow_mode; /* PHY slow mode */ - bool wp_inverted; /* WP pin is inverted */ + + struct mmc_fdt_helper mmc_helper; /* MMC helper for parsing FDT */ }; static uint8_t @@ -189,7 +190,8 @@ sdhci_xenon_get_ro(device_t bus, device_t dev) { struct sdhci_xenon_softc *sc = device_get_softc(bus); - return (sdhci_generic_get_ro(bus, dev) ^ sc->wp_inverted); + return (sdhci_generic_get_ro(bus, dev) ^ + (sc->mmc_helper.props & MMC_PROP_WP_INVERTED)); } static bool @@ -356,15 +358,19 @@ sdhci_xenon_update_ios(device_t brdev, device_t reqdev) if (bootverbose) device_printf(sc->dev, "Powering down sd/mmc\n"); - if (sc->reg_vqmmc) - regulator_disable(sc->reg_vqmmc); + if (sc->mmc_helper.vmmc_supply) + regulator_disable(sc->mmc_helper.vmmc_supply); + if (sc->mmc_helper.vqmmc_supply) + regulator_disable(sc->mmc_helper.vqmmc_supply); break; case power_up: if (bootverbose) device_printf(sc->dev, "Powering up sd/mmc\n"); - if (sc->reg_vqmmc) - regulator_enable(sc->reg_vqmmc); + if (sc->mmc_helper.vmmc_supply) + regulator_enable(sc->mmc_helper.vmmc_supply); + if (sc->mmc_helper.vqmmc_supply) + regulator_enable(sc->mmc_helper.vqmmc_supply); break; }; @@ -391,7 +397,7 @@ sdhci_xenon_switch_vccq(device_t brdev, device_t reqdev) sc = device_get_softc(brdev); - if (sc->reg_vqmmc == NULL) + if (sc->mmc_helper.vqmmc_supply == NULL) return EOPNOTSUPP; slot = device_get_ivars(reqdev); @@ -406,7 +412,7 @@ sdhci_xenon_switch_vccq(device_t brdev, device_t reqdev) return EINVAL; } - err = regulator_set_voltage(sc->reg_vqmmc, uvolt, uvolt); + err = regulator_set_voltage(sc->mmc_helper.vqmmc_supply, uvolt, uvolt); if (err != 0) { device_printf(sc->dev, "Cannot set vqmmc to %d<->%d\n", @@ -444,8 +450,6 @@ sdhci_xenon_probe(device_t dev) sc->max_clk = cid; if (OF_hasprop(sc->node, "no-1-8-v")) sc->no_18v = true; - if (OF_hasprop(sc->node, "wp-inverted")) - sc->wp_inverted = true; if (OF_hasprop(sc->node, "marvell,xenon-phy-slow-mode")) sc->slow_mode = true; sc->znr = XENON_ZNR_DEF_VALUE; @@ -456,11 +460,6 @@ sdhci_xenon_probe(device_t dev) if ((OF_getencprop(sc->node, "marvell,xenon-phy-zpr", &cid, sizeof(cid))) > 0) sc->zpr = cid & XENON_ZPR_MASK; - if (regulator_get_by_ofw_property(dev, 0, "vqmmc-supply", - &sc->reg_vqmmc) == 0 && bootverbose) { - if (bootverbose) - device_printf(dev, "vqmmc-supply regulator found\n"); - } return (0); } @@ -515,6 +514,8 @@ sdhci_xenon_attach(device_t dev) */ sc->gpio = sdhci_fdt_gpio_setup(dev, slot); + mmc_fdt_parse(dev, 0, &sc->mmc_helper, &sc->slot->host); + if (sdhci_init_slot(dev, sc->slot, 0)) goto fail;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203071600.227G06wM066382>