git: 5652be30a322 - main - sdhci: allow setting MMC capabilities before sdhci_init_slot

[Marcin Wojtas]

The branch main has been updated by mw:

URL: https://cgit.FreeBSD.org/src/commit/?id=5652be30a322f2543bc1e3bcc135abc56b3eb268

commit 5652be30a322f2543bc1e3bcc135abc56b3eb268
Author:     Marcin Wojtas <mw at FreeBSD.org>
AuthorDate: 2021-05-04 22:57:50 +0000
Commit:     Marcin Wojtas <mw at FreeBSD.org>
CommitDate: 2021-06-02 07:55:19 +0000

    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
---
 sys/dev/sdhci/sdhci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/dev/sdhci/sdhci.c b/sys/dev/sdhci/sdhci.c
index 68a3cf9ab4d3..22df56672c4b 100644
--- 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)