diff options
| author | Tom Rini <trini@konsulko.com> | 2022-02-09 19:40:27 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-02-09 19:40:27 +0300 |
| commit | 83d4b7b1e7d785574bba43a66a3b35bdeb080833 (patch) | |
| tree | 6253613b1957198f91270a85d82a1a8fd55a590d /drivers/mmc | |
| parent | 859703251251d9567f29ab10c0a29f98eb0aff5c (diff) | |
| parent | 14448e9c97f06717cac95888329ab7cf31929050 (diff) | |
| download | u-boot-83d4b7b1e7d785574bba43a66a3b35bdeb080833.tar.xz | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
- Fix an issue with fsl_esdhc_imx
- Consider GP partitions in "mmc hwpartition user enh start -"
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/fsl_esdhc_imx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index 08ea98fe81..32b42c3fd5 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -336,9 +336,8 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, } } - if (IS_ENABLED(CONFIG_SYS_FSL_ESDHC_USE_PIO)) - esdhc_setup_watermark_level(priv, data); - else + esdhc_setup_watermark_level(priv, data); + if (!IS_ENABLED(CONFIG_SYS_FSL_ESDHC_USE_PIO)) esdhc_setup_dma(priv, data); /* Calculate the timeout period for data transactions */ |