Merge tag 'mmc-6-23' of https://github.com/MrVan/u-boot

- Pull in the series to split fsl_esdhc for i.MX/non-i.MX cleanly

diff --cc board/menlo/m53menlo/m53menlo.c
index 31ba44e452d74a8b21974a141abe2d8a61f5ecd2,35e9b02e8652b995aeb443de3038f568a501155f..f2227f69926beac90e82d4bcc3d62587b67a13ac
--- 1/board/menlo/m53menlo/m53menlo.c
--- 2/board/menlo/m53menlo/m53menlo.c
+++ b/board/menlo/m53menlo/m53menlo.c
@@@ -125,6 -150,44 +125,43 @@@ static void setup_iomux_fec(void
        imx_iomux_v3_setup_multiple_pads(fec_pads, ARRAY_SIZE(fec_pads));
  }
  
 -#ifdef CONFIG_VIDEO
+ #ifdef CONFIG_FSL_ESDHC_IMX
+ struct fsl_esdhc_cfg esdhc_cfg = {
+       MMC_SDHC1_BASE_ADDR,
+ };
+ 
+ int board_mmc_getcd(struct mmc *mmc)
+ {
+       imx_iomux_v3_setup_pad(MX53_PAD_GPIO_1__GPIO1_1);
+       gpio_direction_input(IMX_GPIO_NR(1, 1));
+ 
+       return !gpio_get_value(IMX_GPIO_NR(1, 1));
+ }
+ 
+ #define SD_CMD_PAD_CTRL               (PAD_CTL_HYS | PAD_CTL_DSE_HIGH | \
+                                PAD_CTL_PUS_100K_UP)
+ #define SD_PAD_CTRL           (PAD_CTL_HYS | PAD_CTL_PUS_47K_UP | \
+                                PAD_CTL_DSE_HIGH)
+ 
+ int board_mmc_init(bd_t *bis)
+ {
+       static const iomux_v3_cfg_t sd1_pads[] = {
+               NEW_PAD_CTRL(MX53_PAD_SD1_CMD__ESDHC1_CMD, SD_CMD_PAD_CTRL),
+               NEW_PAD_CTRL(MX53_PAD_SD1_CLK__ESDHC1_CLK, SD_PAD_CTRL),
+               NEW_PAD_CTRL(MX53_PAD_SD1_DATA0__ESDHC1_DAT0, SD_PAD_CTRL),
+               NEW_PAD_CTRL(MX53_PAD_SD1_DATA1__ESDHC1_DAT1, SD_PAD_CTRL),
+               NEW_PAD_CTRL(MX53_PAD_SD1_DATA2__ESDHC1_DAT2, SD_PAD_CTRL),
+               NEW_PAD_CTRL(MX53_PAD_SD1_DATA3__ESDHC1_DAT3, SD_PAD_CTRL),
+       };
+ 
+       esdhc_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
+ 
+       imx_iomux_v3_setup_multiple_pads(sd1_pads, ARRAY_SIZE(sd1_pads));
+ 
+       return fsl_esdhc_initialize(bis, &esdhc_cfg);
+ }
+ #endif
+ 
  static void enable_lvds_clock(struct display_info_t const *dev, const u8 hclk)
  {
        static struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)MXC_CCM_BASE;

diff --cc configs/m53menlo_defconfig
index 5a1fbf52985003f8517d0ba22082209b1ecc4816,9622cb79d6b601b85acc7b7fa12e33bf4a17a9a7..3a5fa26bcd3da800b7ad35f55f9257c687856e6d
--- 1/configs/m53menlo_defconfig
--- 2/configs/m53menlo_defconfig
+++ b/configs/m53menlo_defconfig
@@@ -58,9 -52,7 +58,9 @@@ CONFIG_DM=
  CONFIG_BOOTCOUNT_LIMIT=y
  CONFIG_BOOTCOUNT_BOOTLIMIT=3
  CONFIG_SYS_BOOTCOUNT_MAGIC=0x0B01C041
- CONFIG_FSL_ESDHC=y
 +CONFIG_DM_GPIO=y
 +CONFIG_DM_MMC=y
+ CONFIG_FSL_ESDHC_IMX=y
  CONFIG_NAND=y
  CONFIG_NAND_MXC=y
  CONFIG_PHYLIB=y

diff --cc configs/wandboard_defconfig
Simple merge