aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Strobl <marius@FreeBSD.org>2024-02-05 19:08:33 +0000
committerMarius Strobl <marius@FreeBSD.org>2024-02-05 22:43:48 +0000
commit069c6ac2c698db68983efd17198e9c202c976d25 (patch)
tree560c2c30c0750c96cfaeb106818bba98299f57d0
parenta841e5470385fa62fa65d6de5bcba33afdbf42ea (diff)
downloadsrc-069c6ac2c698db68983efd17198e9c202c976d25.tar.gz
src-069c6ac2c698db68983efd17198e9c202c976d25.zip
sdhci_fsl_fdt(4): Actually use modified SDHCI capabilities
SDHCI_QUIRK_MISSING_CAPS needs to be set unconditionally so sdhci(4) adheres to the slot caps and caps2 set by sdhci_fsl_fdt(4). However, so far this bug didn't have an impact as the front-end only filters SDHCI_CAN_DO_SUSPEND, which in turn isn't used, yet.
-rw-r--r--sys/dev/sdhci/sdhci_fsl_fdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/sdhci/sdhci_fsl_fdt.c b/sys/dev/sdhci/sdhci_fsl_fdt.c
index c04bdefb1382..3220f00f277d 100644
--- a/sys/dev/sdhci/sdhci_fsl_fdt.c
+++ b/sys/dev/sdhci/sdhci_fsl_fdt.c
@@ -818,6 +818,7 @@ sdhci_fsl_fdt_of_parse(device_t dev)
/* Call mmc_fdt_parse in order to get mmc related properties. */
mmc_fdt_parse(dev, node, &sc->fdt_helper, &sc->slot.host);
+ sc->slot.quirks |= SDHCI_QUIRK_MISSING_CAPS;
sc->slot.caps = sdhci_fsl_fdt_read_4(dev, &sc->slot,
SDHCI_CAPABILITIES) & ~(SDHCI_CAN_DO_SUSPEND);
sc->slot.caps2 = sdhci_fsl_fdt_read_4(dev, &sc->slot,
@@ -837,7 +838,6 @@ sdhci_fsl_fdt_of_parse(device_t dev)
(vdd_mask != (sc->slot.caps & SDHCI_FSL_CAN_VDD_MASK))) {
sc->slot.caps &= ~(SDHCI_FSL_CAN_VDD_MASK);
sc->slot.caps |= vdd_mask;
- sc->slot.quirks |= SDHCI_QUIRK_MISSING_CAPS;
}
}