diff options
| author | ian <ian@FreeBSD.org> | 2014-02-02 19:17:28 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2014-02-02 19:17:28 +0000 |
| commit | 71d90c04a87e5d83dd12a18e730bf5a49659d712 (patch) | |
| tree | f7a07f25a40a264286f85b60ecb1346dd35ef91b /sys/dev/sdhci | |
| parent | 34475ded0642e033e494961693b123591dd96ff8 (diff) | |
| download | FreeBSD-src-71d90c04a87e5d83dd12a18e730bf5a49659d712.zip FreeBSD-src-71d90c04a87e5d83dd12a18e730bf5a49659d712.tar.gz | |
Follow r261352 by updating all drivers which are children of simplebus
to check the status property in their probe routines.
Simplebus used to only instantiate its children whose status="okay"
but that was improper behavior, fixed in r261352. Now that it doesn't
check anymore and probes all its children; the children all have to
do the check because really only the children know how to properly
interpret their status property strings.
Right now all existing drivers only understand "okay" versus something-
that's-not-okay, so they all use the new ofw_bus_status_okay() helper.
Diffstat (limited to 'sys/dev/sdhci')
| -rw-r--r-- | sys/dev/sdhci/sdhci_fdt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c index e92b158..65eac6d 100644 --- a/sys/dev/sdhci/sdhci_fdt.c +++ b/sys/dev/sdhci/sdhci_fdt.c @@ -157,6 +157,9 @@ sdhci_fdt_probe(device_t dev) sc->quirks = 0; sc->num_slots = 1; + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_is_compatible(dev, "sdhci_generic")) { device_set_desc(dev, "generic fdt SDHCI controller"); } else if (ofw_bus_is_compatible(dev, "xlnx,zy7_sdhci")) { |
