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 -"

diff --combined drivers/mmc/fsl_esdhc_imx.c
index 08ea98f,efa5ed0..32b42c3
--- 1/drivers/mmc/fsl_esdhc_imx.c
--- 2/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@@ -336,9 -336,8 +336,8 @@@ static int esdhc_setup_data(struct fsl_
                }
        }
  
-       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 */
@@@ -453,7 -452,7 +452,7 @@@ static int esdhc_send_cmd_common(struc
  
        /* Send the command */
        esdhc_write32(&regs->cmdarg, cmd->cmdarg);
 -      if IS_ENABLED(CONFIG_FSL_USDHC) {
 +      if (IS_ENABLED(CONFIG_FSL_USDHC)) {
                u32 mixctrl = esdhc_read32(&regs->mixctrl);
  
                esdhc_write32(&regs->mixctrl,