mmc: Make ext_resources non-optional
EXT_RESOURCES have been introduced in 12-CURRENT and all supported releases have it enabled in their kernel config. MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D33821
This commit is contained in:
parent
a5339ba3ff
commit
78f8b4aafa
@ -41,9 +41,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <dev/ofw/ofw_bus.h>
|
||||
#include <dev/ofw/ofw_bus_subr.h>
|
||||
|
||||
#ifdef EXT_RESOURCES
|
||||
#include <dev/extres/regulator/regulator.h>
|
||||
#endif
|
||||
|
||||
#include <dev/mmc/mmc_helpers.h>
|
||||
|
||||
@ -61,7 +59,6 @@ mmc_fdt_parse(device_t dev, phandle_t node, struct mmc_helper *helper,
|
||||
|
||||
helper->props = mmc_helper.props;
|
||||
|
||||
#ifdef EXT_RESOURCES
|
||||
/*
|
||||
* Get the regulators if they are supported and
|
||||
* clean the non supported modes based on the available voltages.
|
||||
@ -98,7 +95,6 @@ mmc_fdt_parse(device_t dev, phandle_t node, struct mmc_helper *helper,
|
||||
host->caps |= MMC_CAP_SIGNALING_330;
|
||||
} else
|
||||
host->caps |= MMC_CAP_SIGNALING_330;
|
||||
#endif
|
||||
|
||||
if (OF_hasprop(node, "mmc-pwrseq")) {
|
||||
if (OF_getencprop(node, "mmc-pwrseq", &pwrseq_xref, sizeof(pwrseq_xref)) == -1) {
|
||||
|
@ -33,9 +33,7 @@
|
||||
#include <dev/gpio/gpiobusvar.h>
|
||||
#include <dev/ofw/ofw_bus.h>
|
||||
|
||||
#ifdef EXT_RESOURCES
|
||||
#include <dev/extres/regulator/regulator.h>
|
||||
#endif
|
||||
|
||||
#include <dev/mmc/mmc_helpers.h>
|
||||
|
||||
|
@ -30,9 +30,7 @@
|
||||
|
||||
#include <dev/gpio/gpiobusvar.h>
|
||||
|
||||
#ifdef EXT_RESOURCES
|
||||
#include <dev/extres/regulator/regulator.h>
|
||||
#endif
|
||||
|
||||
struct mmc_helper {
|
||||
device_t dev;
|
||||
@ -56,10 +54,8 @@ struct mmc_helper {
|
||||
#define MMC_PROP_NO_SD (1 << 6)
|
||||
#define MMC_PROP_NO_MMC (1 << 7)
|
||||
|
||||
#ifdef EXT_RESOURCES
|
||||
regulator_t vmmc_supply;
|
||||
regulator_t vqmmc_supply;
|
||||
#endif
|
||||
|
||||
device_t mmc_pwrseq;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user