sdhci: allow setting MMC capabilities before sdhci_init_slot

With this change the host controller drivers can set the MMC capabilities
(e.g. using mmc_fdt_parse() helper) before calling sdhci_init_slot().
This way the configuration dump (eg. in bootverbose) can include the
possible additional information.

Reviewed by: manu
Obtained from: Semihalf
Sponsored by: Marvell
Differential Revision: https://reviews.freebsd.org/D30561
MFC after: 2 weeks

diff --git a/sys/dev/sdhci/sdhci.c b/sys/dev/sdhci/sdhci.c
index 68a3cf9ab4d38851d0eedefd26328516ee886bb4..22df56672c4b0fc3526655894506469c71f76704 100644 (file)
--- a/sys/dev/sdhci/sdhci.c
+++ b/sys/dev/sdhci/sdhci.c
@@ -891,7 +891,8 @@ sdhci_init_slot(device_t dev, struct sdhci_slot *slot, int num)
                    "support voltages.\n");
        }
 
-       host_caps = MMC_CAP_4_BIT_DATA;
+       host_caps = slot->host.caps;
+       host_caps |= MMC_CAP_4_BIT_DATA;
        if (caps & SDHCI_CAN_DO_8BITBUS)
                host_caps |= MMC_CAP_8_BIT_DATA;
        if (caps & SDHCI_CAN_DO_HISPD)