Don't call sdhci_init_slot() until after handling the FDT properties
related to detecting card presence. This actually makes no difference now, but will when we get support for gpio-based card detection.
This commit is contained in:
parent
5b9b849b45
commit
647c8464a6
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=264052
@ -730,9 +730,6 @@ imx_sdhci_attach(device_t dev)
|
||||
sc->baseclk_hz = imx51_get_clock(IMX51CLK_PERCLK_ROOT);
|
||||
}
|
||||
|
||||
sdhci_init_slot(dev, &sc->slot, 0);
|
||||
callout_init(&sc->r1bfix_callout, true);
|
||||
|
||||
/*
|
||||
* If the slot is flagged with the non-removable property, set our flag
|
||||
* to always force the SDHCI_CARD_PRESENT bit on.
|
||||
@ -752,6 +749,9 @@ imx_sdhci_attach(device_t dev)
|
||||
sc->force_card_present = true;
|
||||
}
|
||||
|
||||
callout_init(&sc->r1bfix_callout, true);
|
||||
sdhci_init_slot(dev, &sc->slot, 0);
|
||||
|
||||
bus_generic_probe(dev);
|
||||
bus_generic_attach(dev);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user