Am Montag, 1. April 2019, 19:44:22 CEST schrieb Urja Rannikko:
Fixes the microSD slot on the ASUS C201.
Signed-off-by: Urja Rannikko urjaman@gmail.com
v2: use #if CONFIG_IS_ENABLED(DM_REGULATOR)
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..b04c1f9f41 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;
This produces a new warning about an unused variable in the !DM_REGULATOR case. I guess either move the "ret" below or add a " __maybe_unused" if that is possible for variables?
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);
+#if CONFIG_IS_ENABLED(DM_REGULATOR)
- if (mmc->vqmmc_supply) {
if (mmc->signal_voltage == MMC_SIGNAL_VOLTAGE_180)regulator_set_value(mmc->vqmmc_supply, 1800000);elseregulator_set_value(mmc->vqmmc_supply, 3300000);ret = regulator_set_enable_if_allowed(mmc->vqmmc_supply, true);if (ret)return ret;- }
+#endif
- return 0;
}