diff options
| author | Renato Botelho <renato@netgate.com> | 2017-07-03 16:41:30 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-07-03 16:41:30 -0300 |
| commit | b91e8edec6ef973706ceba5985379a0aded6a5aa (patch) | |
| tree | 92c1d3976fd61f447f3e62225141c02b6ef4c320 /sys/arm/ti | |
| parent | 5fa580e9c45b6668f134701651fa17cad722750e (diff) | |
| parent | ff3a058c4f832f66c1a779cf9bd05f758ad411d8 (diff) | |
| download | FreeBSD-src-b91e8edec6ef973706ceba5985379a0aded6a5aa.zip FreeBSD-src-b91e8edec6ef973706ceba5985379a0aded6a5aa.tar.gz | |
Merge remote-tracking branch 'origin/releng/11.1' into RELENG_2_5
Diffstat (limited to 'sys/arm/ti')
| -rw-r--r-- | sys/arm/ti/ti_sdhci.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/arm/ti/ti_sdhci.c b/sys/arm/ti/ti_sdhci.c index 16fa956..6b188dd 100644 --- a/sys/arm/ti/ti_sdhci.c +++ b/sys/arm/ti/ti_sdhci.c @@ -606,6 +606,11 @@ ti_sdhci_attach(device_t dev) * before waiting to see them de-asserted. */ sc->slot.quirks |= SDHCI_QUIRK_WAITFOR_RESET_ASSERTED; + + /* + * The controller waits for busy responses. + */ + sc->slot.quirks |= SDHCI_QUIRK_WAIT_WHILE_BUSY; /* * DMA is not really broken, I just haven't implemented it yet. @@ -692,7 +697,6 @@ static device_method_t ti_sdhci_methods[] = { /* Bus interface */ DEVMETHOD(bus_read_ivar, sdhci_generic_read_ivar), DEVMETHOD(bus_write_ivar, sdhci_generic_write_ivar), - DEVMETHOD(bus_print_child, bus_generic_print_child), /* MMC bridge interface */ DEVMETHOD(mmcbr_update_ios, ti_sdhci_update_ios), @@ -723,7 +727,7 @@ static driver_t ti_sdhci_driver = { sizeof(struct ti_sdhci_softc), }; -DRIVER_MODULE(sdhci_ti, simplebus, ti_sdhci_driver, ti_sdhci_devclass, 0, 0); +DRIVER_MODULE(sdhci_ti, simplebus, ti_sdhci_driver, ti_sdhci_devclass, NULL, + NULL); MODULE_DEPEND(sdhci_ti, sdhci, 1, 1, 1); -DRIVER_MODULE(mmc, sdhci_ti, mmc_driver, mmc_devclass, NULL, NULL); -MODULE_DEPEND(sdhci_ti, mmc, 1, 1, 1); +MMC_DECLARE_BRIDGE(sdhci_ti); |
