
Am Freitag, 22. März 2019, 20:14:36 CET schrieb Urja Rannikko:
Fixes the microSD slot on the ASUS C201.
Signed-off-by: Urja Rannikko urjaman@gmail.com
drivers/mmc/dw_mmc.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c index 93a836eac3..e1960b213a 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c @@ -13,6 +13,7 @@ #include <mmc.h> #include <dwmmc.h> #include <wait_bit.h> +#include <power/regulator.h>
#define PAGE_SIZE 4096
@@ -440,6 +441,7 @@ static int dwmci_set_ios(struct mmc *mmc) #endif struct dwmci_host *host = (struct dwmci_host *)mmc->priv; u32 ctype, regs;
int ret;
debug("Buswidth = %d, clock: %d\n", mmc->bus_width, mmc->clock);
@@ -469,6 +471,19 @@ static int dwmci_set_ios(struct mmc *mmc) if (host->clksel) host->clksel(host);
+#ifdef CONFIG_DM_REGULATOR
this should be #if CONFIG_IS_ENABLED(DM_REGULATOR)
because otherwise an SPL-build using the mmc driver may fail with
drivers/mmc/dw_mmc.c: In function ‘dwmci_set_ios’: drivers/mmc/dw_mmc.c:475:9: error: ‘struct mmc’ has no member named ‘vqmmc_supply’ if (mmc->vqmmc_supply) { ^~ drivers/mmc/dw_mmc.c:477:27: error: ‘struct mmc’ has no member named ‘vqmmc_supply’ regulator_set_value(mmc->vqmmc_supply, 1800000); ^~ drivers/mmc/dw_mmc.c:479:27: error: ‘struct mmc’ has no member named ‘vqmmc_supply’ regulator_set_value(mmc->vqmmc_supply, 3300000); ^~ drivers/mmc/dw_mmc.c:481:44: error: ‘struct mmc’ has no member named ‘vqmmc_supply’ ret = regulator_set_enable_if_allowed(mmc->vqmmc_supply, true);
- if (mmc->vqmmc_supply) {
if (mmc->signal_voltage == MMC_SIGNAL_VOLTAGE_180)
regulator_set_value(mmc->vqmmc_supply, 1800000);
else
regulator_set_value(mmc->vqmmc_supply, 3300000);
ret = regulator_set_enable_if_allowed(mmc->vqmmc_supply, true);
if (ret)
return ret;
- }
+#endif
- return 0;
}