diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-25 09:02:35 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-25 09:02:35 -0500 |
| commit | 4057b98ff2f3fd112f05024cad5ccf970fa9bed4 (patch) | |
| tree | aa18deef065e5469986c3326733c03e01fd914c2 /drivers/mmc | |
| parent | 7f10b8eed450fcac6296ef53432d3b30c407cc39 (diff) | |
| parent | 4f37aa957939937f9f5b472f829ab81ef13c479a (diff) | |
| download | u-boot-4057b98ff2f3fd112f05024cad5ccf970fa9bed4.zip u-boot-4057b98ff2f3fd112f05024cad5ccf970fa9bed4.tar.gz u-boot-4057b98ff2f3fd112f05024cad5ccf970fa9bed4.tar.bz2 | |
Merge tag 'u-boot-imx-20210125' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
Changes for 2020.04
-------------------
- new board:
Phytec phyCORE-i.MX8MP
i.MX8MN Beacon EmbeddedWorks devkit
- Fixes:
several nanbcb fixes
fix for imx8mm_beacon
- further switch to distro boot commands
- DM:
DM Ether for MX6UL
CI:
https://gitlab.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/6013
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/fsl_esdhc_imx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index f47a095..8ac8597 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -790,7 +790,9 @@ static int esdhc_set_voltage(struct mmc *mmc) { struct fsl_esdhc_priv *priv = dev_get_priv(mmc->dev); struct fsl_esdhc *regs = priv->esdhc_regs; +#if CONFIG_IS_ENABLED(DM_REGULATOR) int ret; +#endif priv->signal_voltage = mmc->signal_voltage; switch (mmc->signal_voltage) { |