Page MenuHomeFreeBSD

D33821.id101256.diff
No OneTemporary

D33821.id101256.diff

Index: sys/dev/mmc/mmc_fdt_helpers.h
===================================================================
--- sys/dev/mmc/mmc_fdt_helpers.h
+++ sys/dev/mmc/mmc_fdt_helpers.h
@@ -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>
Index: sys/dev/mmc/mmc_fdt_helpers.c
===================================================================
--- sys/dev/mmc/mmc_fdt_helpers.c
+++ sys/dev/mmc/mmc_fdt_helpers.c
@@ -41,9 +41,7 @@
#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 @@
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 @@
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) {
Index: sys/dev/mmc/mmc_helpers.h
===================================================================
--- sys/dev/mmc/mmc_helpers.h
+++ sys/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 @@
#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;
};

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 28, 6:55 AM (15 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28064080
Default Alt Text
D33821.id101256.diff (1 KB)

Event Timeline