KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

bcm2835_sdhci: Make ext_resources non-optional

Browse Source 
EXT_RESOURCES have been introduced in 12-CURRENT and all supported
releases have it enabled in their kernel config.

Reviewed by:	kevans
MFC after:      1 month
Differential Revision:	https://reviews.freebsd.org/D33829
This commit is contained in:
Emmanuel Vadot
2022-01-11 10:48:15 +01:00
parent 5c00765bf2
commit 14444bf7c8
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
-6
View File
@@ -395,13 +395,10 @@ bcm_sdhci_intr(void *arg)
static int static int
bcm_sdhci_update_ios(device_t bus, device_t child) bcm_sdhci_update_ios(device_t bus, device_t child)
{ {
#ifdef EXT_RESOURCES
struct bcm_sdhci_softc *sc; struct bcm_sdhci_softc *sc;
struct mmc_ios *ios; struct mmc_ios *ios;
#endif
int rv; int rv;
#ifdef EXT_RESOURCES
sc = device_get_softc(bus); sc = device_get_softc(bus);
ios = &sc->sc_slot.host.ios; ios = &sc->sc_slot.host.ios;
@@ -411,20 +408,17 @@ bcm_sdhci_update_ios(device_t bus, device_t child)
if (sc->sc_mmc_helper.vqmmc_supply) if (sc->sc_mmc_helper.vqmmc_supply)
regulator_enable(sc->sc_mmc_helper.vqmmc_supply); regulator_enable(sc->sc_mmc_helper.vqmmc_supply);
} }
#endif
rv = sdhci_generic_update_ios(bus, child); rv = sdhci_generic_update_ios(bus, child);
if (rv != 0) if (rv != 0)
return (rv); return (rv);
#ifdef EXT_RESOURCES
if (ios->power_mode == power_off) { if (ios->power_mode == power_off) {
if (sc->sc_mmc_helper.vmmc_supply) if (sc->sc_mmc_helper.vmmc_supply)
regulator_disable(sc->sc_mmc_helper.vmmc_supply); regulator_disable(sc->sc_mmc_helper.vmmc_supply);
if (sc->sc_mmc_helper.vqmmc_supply) if (sc->sc_mmc_helper.vqmmc_supply)
regulator_disable(sc->sc_mmc_helper.vqmmc_supply); regulator_disable(sc->sc_mmc_helper.vqmmc_supply);
} }
#endif
return (0); return (0);
} }