]> git.ipfire.org Git - people/ms/u-boot.git/blobdiff - drivers/mmc/mmc.c
mmc: use the right voltage level for MMC DDR and HS200 modes
[people/ms/u-boot.git] / drivers / mmc / mmc.c
index 65d8b3a87ac1c11e6fe52290dc89b3fa85f949c1..877ce1757da38bce892e0d6c319e29d39a5e7bf9 100644 (file)
 #include <config.h>
 #include <common.h>
 #include <command.h>
+#include <dm.h>
+#include <dm/device-internal.h>
 #include <errno.h>
 #include <mmc.h>
 #include <part.h>
+#include <power/regulator.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <linux/list.h>
 #include <div64.h>
 #include "mmc_private.h"
 
-static struct list_head mmc_devices;
-static int cur_dev_num = -1;
+static const unsigned int sd_au_size[] = {
+       0,              SZ_16K / 512,           SZ_32K / 512,
+       SZ_64K / 512,   SZ_128K / 512,          SZ_256K / 512,
+       SZ_512K / 512,  SZ_1M / 512,            SZ_2M / 512,
+       SZ_4M / 512,    SZ_8M / 512,            (SZ_8M + SZ_4M) / 512,
+       SZ_16M / 512,   (SZ_16M + SZ_8M) / 512, SZ_32M / 512,   SZ_64M / 512,
+};
+
+static int mmc_set_signal_voltage(struct mmc *mmc, uint signal_voltage);
+static int mmc_power_cycle(struct mmc *mmc);
+static int mmc_select_mode_and_width(struct mmc *mmc, uint card_caps);
+
+#if CONFIG_IS_ENABLED(MMC_TINY)
+static struct mmc mmc_static;
+struct mmc *find_mmc_device(int dev_num)
+{
+       return &mmc_static;
+}
+
+void mmc_do_preinit(void)
+{
+       struct mmc *m = &mmc_static;
+#ifdef CONFIG_FSL_ESDHC_ADAPTER_IDENT
+       mmc_set_preinit(m, 1);
+#endif
+       if (m->preinit)
+               mmc_start_init(m);
+}
+
+struct blk_desc *mmc_get_blk_desc(struct mmc *mmc)
+{
+       return &mmc->block_dev;
+}
+#endif
+
+#if !CONFIG_IS_ENABLED(DM_MMC)
+
+static int mmc_wait_dat0(struct mmc *mmc, int state, int timeout)
+{
+       return -ENOSYS;
+}
 
 __weak int board_mmc_getwp(struct mmc *mmc)
 {
@@ -46,19 +89,24 @@ __weak int board_mmc_getcd(struct mmc *mmc)
 {
        return -1;
 }
+#endif
 
-int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data)
+#ifdef CONFIG_MMC_TRACE
+void mmmc_trace_before_send(struct mmc *mmc, struct mmc_cmd *cmd)
 {
-       int ret;
+       printf("CMD_SEND:%d\n", cmd->cmdidx);
+       printf("\t\tARG\t\t\t 0x%08X\n", cmd->cmdarg);
+}
 
-#ifdef CONFIG_MMC_TRACE
+void mmmc_trace_after_send(struct mmc *mmc, struct mmc_cmd *cmd, int ret)
+{
        int i;
        u8 *ptr;
 
-       printf("CMD_SEND:%d\n", cmd->cmdidx);
-       printf("\t\tARG\t\t\t 0x%08X\n", cmd->cmdarg);
-       ret = mmc->cfg->ops->send_cmd(mmc, cmd, data);
-       switch (cmd->resp_type) {
+       if (ret) {
+               printf("\t\tRET\t\t\t %d\n", ret);
+       } else {
+               switch (cmd->resp_type) {
                case MMC_RSP_NONE:
                        printf("\t\tMMC_RSP_NONE\n");
                        break;
@@ -98,59 +146,132 @@ int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data)
                default:
                        printf("\t\tERROR MMC rsp not supported\n");
                        break;
+               }
        }
-#else
-       ret = mmc->cfg->ops->send_cmd(mmc, cmd, data);
+}
+
+void mmc_trace_state(struct mmc *mmc, struct mmc_cmd *cmd)
+{
+       int status;
+
+       status = (cmd->response[0] & MMC_STATUS_CURR_STATE) >> 9;
+       printf("CURR STATE:%d\n", status);
+}
+#endif
+
+#if CONFIG_IS_ENABLED(MMC_VERBOSE) || defined(DEBUG)
+const char *mmc_mode_name(enum bus_mode mode)
+{
+       static const char *const names[] = {
+             [MMC_LEGACY]      = "MMC legacy",
+             [SD_LEGACY]       = "SD Legacy",
+             [MMC_HS]          = "MMC High Speed (26MHz)",
+             [SD_HS]           = "SD High Speed (50MHz)",
+             [UHS_SDR12]       = "UHS SDR12 (25MHz)",
+             [UHS_SDR25]       = "UHS SDR25 (50MHz)",
+             [UHS_SDR50]       = "UHS SDR50 (100MHz)",
+             [UHS_SDR104]      = "UHS SDR104 (208MHz)",
+             [UHS_DDR50]       = "UHS DDR50 (50MHz)",
+             [MMC_HS_52]       = "MMC High Speed (52MHz)",
+             [MMC_DDR_52]      = "MMC DDR52 (52MHz)",
+             [MMC_HS_200]      = "HS200 (200MHz)",
+       };
+
+       if (mode >= MMC_MODES_END)
+               return "Unknown mode";
+       else
+               return names[mode];
+}
 #endif
+
+static uint mmc_mode2freq(struct mmc *mmc, enum bus_mode mode)
+{
+       static const int freqs[] = {
+             [SD_LEGACY]       = 25000000,
+             [MMC_HS]          = 26000000,
+             [SD_HS]           = 50000000,
+             [UHS_SDR12]       = 25000000,
+             [UHS_SDR25]       = 50000000,
+             [UHS_SDR50]       = 100000000,
+             [UHS_SDR104]      = 208000000,
+             [UHS_DDR50]       = 50000000,
+             [MMC_HS_52]       = 52000000,
+             [MMC_DDR_52]      = 52000000,
+             [MMC_HS_200]      = 200000000,
+       };
+
+       if (mode == MMC_LEGACY)
+               return mmc->legacy_speed;
+       else if (mode >= MMC_MODES_END)
+               return 0;
+       else
+               return freqs[mode];
+}
+
+static int mmc_select_mode(struct mmc *mmc, enum bus_mode mode)
+{
+       mmc->selected_mode = mode;
+       mmc->tran_speed = mmc_mode2freq(mmc, mode);
+       mmc->ddr_mode = mmc_is_mode_ddr(mode);
+       debug("selecting mode %s (freq : %d MHz)\n", mmc_mode_name(mode),
+             mmc->tran_speed / 1000000);
+       return 0;
+}
+
+#if !CONFIG_IS_ENABLED(DM_MMC)
+int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data)
+{
+       int ret;
+
+       mmmc_trace_before_send(mmc, cmd);
+       ret = mmc->cfg->ops->send_cmd(mmc, cmd, data);
+       mmmc_trace_after_send(mmc, cmd, ret);
+
        return ret;
 }
+#endif
 
 int mmc_send_status(struct mmc *mmc, int timeout)
 {
        struct mmc_cmd cmd;
        int err, retries = 5;
-#ifdef CONFIG_MMC_TRACE
-       int status;
-#endif
 
        cmd.cmdidx = MMC_CMD_SEND_STATUS;
        cmd.resp_type = MMC_RSP_R1;
        if (!mmc_host_is_spi(mmc))
                cmd.cmdarg = mmc->rca << 16;
 
-       do {
+       while (1) {
                err = mmc_send_cmd(mmc, &cmd, NULL);
                if (!err) {
                        if ((cmd.response[0] & MMC_STATUS_RDY_FOR_DATA) &&
                            (cmd.response[0] & MMC_STATUS_CURR_STATE) !=
                             MMC_STATE_PRG)
                                break;
-                       else if (cmd.response[0] & MMC_STATUS_MASK) {
+
+                       if (cmd.response[0] & MMC_STATUS_MASK) {
 #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
                                printf("Status Error: 0x%08X\n",
                                        cmd.response[0]);
 #endif
-                               return COMM_ERR;
+                               return -ECOMM;
                        }
                } else if (--retries < 0)
                        return err;
 
-               udelay(1000);
+               if (timeout-- <= 0)
+                       break;
 
-       } while (timeout--);
+               udelay(1000);
+       }
 
-#ifdef CONFIG_MMC_TRACE
-       status = (cmd.response[0] & MMC_STATUS_CURR_STATE) >> 9;
-       printf("CURR STATE:%d\n", status);
-#endif
+       mmc_trace_state(mmc, &cmd);
        if (timeout <= 0) {
 #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
                printf("Timeout waiting card ready\n");
 #endif
-               return TIMEOUT;
+               return -ETIMEDOUT;
        }
-       if (cmd.response[0] & MMC_STATUS_SWITCH_ERROR)
-               return SWITCH_ERR;
 
        return 0;
 }
@@ -158,6 +279,7 @@ int mmc_send_status(struct mmc *mmc, int timeout)
 int mmc_set_blocklen(struct mmc *mmc, int len)
 {
        struct mmc_cmd cmd;
+       int err;
 
        if (mmc->ddr_mode)
                return 0;
@@ -166,26 +288,24 @@ int mmc_set_blocklen(struct mmc *mmc, int len)
        cmd.resp_type = MMC_RSP_R1;
        cmd.cmdarg = len;
 
-       return mmc_send_cmd(mmc, &cmd, NULL);
-}
-
-struct mmc *find_mmc_device(int dev_num)
-{
-       struct mmc *m;
-       struct list_head *entry;
-
-       list_for_each(entry, &mmc_devices) {
-               m = list_entry(entry, struct mmc, link);
+       err = mmc_send_cmd(mmc, &cmd, NULL);
 
-               if (m->block_dev.dev == dev_num)
-                       return m;
+#ifdef CONFIG_MMC_QUIRKS
+       if (err && (mmc->quirks & MMC_QUIRK_RETRY_SET_BLOCKLEN)) {
+               int retries = 4;
+               /*
+                * It has been seen that SET_BLOCKLEN may fail on the first
+                * attempt, let's try a few more time
+                */
+               do {
+                       err = mmc_send_cmd(mmc, &cmd, NULL);
+                       if (!err)
+                               break;
+               } while (retries--);
        }
-
-#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
-       printf("MMC Device %d not found\n", dev_num);
 #endif
 
-       return NULL;
+       return err;
 }
 
 static int mmc_read_blocks(struct mmc *mmc, void *dst, lbaint_t start,
@@ -229,8 +349,18 @@ static int mmc_read_blocks(struct mmc *mmc, void *dst, lbaint_t start,
        return blkcnt;
 }
 
-static ulong mmc_bread(int dev_num, lbaint_t start, lbaint_t blkcnt, void *dst)
+#if CONFIG_IS_ENABLED(BLK)
+ulong mmc_bread(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, void *dst)
+#else
+ulong mmc_bread(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt,
+               void *dst)
+#endif
 {
+#if CONFIG_IS_ENABLED(BLK)
+       struct blk_desc *block_dev = dev_get_uclass_platdata(dev);
+#endif
+       int dev_num = block_dev->devnum;
+       int err;
        lbaint_t cur, blocks_todo = blkcnt;
 
        if (blkcnt == 0)
@@ -240,22 +370,34 @@ static ulong mmc_bread(int dev_num, lbaint_t start, lbaint_t blkcnt, void *dst)
        if (!mmc)
                return 0;
 
-       if ((start + blkcnt) > mmc->block_dev.lba) {
+       if (CONFIG_IS_ENABLED(MMC_TINY))
+               err = mmc_switch_part(mmc, block_dev->hwpart);
+       else
+               err = blk_dselect_hwpart(block_dev, block_dev->hwpart);
+
+       if (err < 0)
+               return 0;
+
+       if ((start + blkcnt) > block_dev->lba) {
 #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
                printf("MMC: block number 0x" LBAF " exceeds max(0x" LBAF ")\n",
-                       start + blkcnt, mmc->block_dev.lba);
+                       start + blkcnt, block_dev->lba);
 #endif
                return 0;
        }
 
-       if (mmc_set_blocklen(mmc, mmc->read_bl_len))
+       if (mmc_set_blocklen(mmc, mmc->read_bl_len)) {
+               debug("%s: Failed to set blocklen\n", __func__);
                return 0;
+       }
 
        do {
                cur = (blocks_todo > mmc->cfg->b_max) ?
                        mmc->cfg->b_max : blocks_todo;
-               if(mmc_read_blocks(mmc, dst, start, cur) != cur)
+               if (mmc_read_blocks(mmc, dst, start, cur) != cur) {
+                       debug("%s: Failed to read blocks\n", __func__);
                        return 0;
+               }
                blocks_todo -= cur;
                start += cur;
                dst += cur * mmc->read_bl_len;
@@ -285,13 +427,73 @@ static int mmc_go_idle(struct mmc *mmc)
        return 0;
 }
 
-static int sd_send_op_cond(struct mmc *mmc)
+static int mmc_switch_voltage(struct mmc *mmc, int signal_voltage)
+{
+       struct mmc_cmd cmd;
+       int err = 0;
+
+       /*
+        * Send CMD11 only if the request is to switch the card to
+        * 1.8V signalling.
+        */
+       if (signal_voltage == MMC_SIGNAL_VOLTAGE_330)
+               return mmc_set_signal_voltage(mmc, signal_voltage);
+
+       cmd.cmdidx = SD_CMD_SWITCH_UHS18V;
+       cmd.cmdarg = 0;
+       cmd.resp_type = MMC_RSP_R1;
+
+       err = mmc_send_cmd(mmc, &cmd, NULL);
+       if (err)
+               return err;
+
+       if (!mmc_host_is_spi(mmc) && (cmd.response[0] & MMC_STATUS_ERROR))
+               return -EIO;
+
+       /*
+        * The card should drive cmd and dat[0:3] low immediately
+        * after the response of cmd11, but wait 100 us to be sure
+        */
+       err = mmc_wait_dat0(mmc, 0, 100);
+       if (err == -ENOSYS)
+               udelay(100);
+       else if (err)
+               return -ETIMEDOUT;
+
+       /*
+        * During a signal voltage level switch, the clock must be gated
+        * for 5 ms according to the SD spec
+        */
+       mmc_set_clock(mmc, mmc->clock, true);
+
+       err = mmc_set_signal_voltage(mmc, signal_voltage);
+       if (err)
+               return err;
+
+       /* Keep clock gated for at least 10 ms, though spec only says 5 ms */
+       mdelay(10);
+       mmc_set_clock(mmc, mmc->clock, false);
+
+       /*
+        * Failure to switch is indicated by the card holding
+        * dat[0:3] low. Wait for at least 1 ms according to spec
+        */
+       err = mmc_wait_dat0(mmc, 1, 1000);
+       if (err == -ENOSYS)
+               udelay(1000);
+       else if (err)
+               return -ETIMEDOUT;
+
+       return 0;
+}
+
+static int sd_send_op_cond(struct mmc *mmc, bool uhs_en)
 {
        int timeout = 1000;
        int err;
        struct mmc_cmd cmd;
 
-       do {
+       while (1) {
                cmd.cmdidx = MMC_CMD_APP_CMD;
                cmd.resp_type = MMC_RSP_R1;
                cmd.cmdarg = 0;
@@ -317,16 +519,22 @@ static int sd_send_op_cond(struct mmc *mmc)
                if (mmc->version == SD_VERSION_2)
                        cmd.cmdarg |= OCR_HCS;
 
+               if (uhs_en)
+                       cmd.cmdarg |= OCR_S18R;
+
                err = mmc_send_cmd(mmc, &cmd, NULL);
 
                if (err)
                        return err;
 
-               udelay(1000);
-       } while ((!(cmd.response[0] & OCR_BUSY)) && timeout--);
+               if (cmd.response[0] & OCR_BUSY)
+                       break;
+
+               if (timeout-- <= 0)
+                       return -EOPNOTSUPP;
 
-       if (timeout <= 0)
-               return UNUSABLE_ERR;
+               udelay(1000);
+       }
 
        if (mmc->version != SD_VERSION_2)
                mmc->version = SD_VERSION_1_0;
@@ -344,57 +552,59 @@ static int sd_send_op_cond(struct mmc *mmc)
 
        mmc->ocr = cmd.response[0];
 
+       if (uhs_en && !(mmc_host_is_spi(mmc)) && (cmd.response[0] & 0x41000000)
+           == 0x41000000) {
+               err = mmc_switch_voltage(mmc, MMC_SIGNAL_VOLTAGE_180);
+               if (err)
+                       return err;
+       }
+
        mmc->high_capacity = ((mmc->ocr & OCR_HCS) == OCR_HCS);
        mmc->rca = 0;
 
        return 0;
 }
 
-/* We pass in the cmd since otherwise the init seems to fail */
-static int mmc_send_op_cond_iter(struct mmc *mmc, struct mmc_cmd *cmd,
-               int use_arg)
+static int mmc_send_op_cond_iter(struct mmc *mmc, int use_arg)
 {
+       struct mmc_cmd cmd;
        int err;
 
-       cmd->cmdidx = MMC_CMD_SEND_OP_COND;
-       cmd->resp_type = MMC_RSP_R3;
-       cmd->cmdarg = 0;
-       if (use_arg && !mmc_host_is_spi(mmc)) {
-               cmd->cmdarg =
+       cmd.cmdidx = MMC_CMD_SEND_OP_COND;
+       cmd.resp_type = MMC_RSP_R3;
+       cmd.cmdarg = 0;
+       if (use_arg && !mmc_host_is_spi(mmc))
+               cmd.cmdarg = OCR_HCS |
                        (mmc->cfg->voltages &
-                       (mmc->op_cond_response & OCR_VOLTAGE_MASK)) |
-                       (mmc->op_cond_response & OCR_ACCESS_MODE);
+                       (mmc->ocr & OCR_VOLTAGE_MASK)) |
+                       (mmc->ocr & OCR_ACCESS_MODE);
 
-               if (mmc->cfg->host_caps & MMC_MODE_HC)
-                       cmd->cmdarg |= OCR_HCS;
-       }
-       err = mmc_send_cmd(mmc, cmd, NULL);
+       err = mmc_send_cmd(mmc, &cmd, NULL);
        if (err)
                return err;
-       mmc->op_cond_response = cmd->response[0];
+       mmc->ocr = cmd.response[0];
        return 0;
 }
 
 static int mmc_send_op_cond(struct mmc *mmc)
 {
-       struct mmc_cmd cmd;
        int err, i;
 
        /* Some cards seem to need this */
        mmc_go_idle(mmc);
 
        /* Asking to the card its capabilities */
-       mmc->op_cond_pending = 1;
        for (i = 0; i < 2; i++) {
-               err = mmc_send_op_cond_iter(mmc, &cmd, i != 0);
+               err = mmc_send_op_cond_iter(mmc, i != 0);
                if (err)
                        return err;
 
                /* exit if not busy (flag seems to be inverted) */
-               if (mmc->op_cond_response & OCR_BUSY)
-                       return 0;
+               if (mmc->ocr & OCR_BUSY)
+                       break;
        }
-       return IN_PROGRESS;
+       mmc->op_cond_pending = 1;
+       return 0;
 }
 
 static int mmc_complete_op_cond(struct mmc *mmc)
@@ -405,15 +615,22 @@ static int mmc_complete_op_cond(struct mmc *mmc)
        int err;
 
        mmc->op_cond_pending = 0;
-       start = get_timer(0);
-       do {
-               err = mmc_send_op_cond_iter(mmc, &cmd, 1);
-               if (err)
-                       return err;
-               if (get_timer(start) > timeout)
-                       return UNUSABLE_ERR;
-               udelay(100);
-       } while (!(mmc->op_cond_response & OCR_BUSY));
+       if (!(mmc->ocr & OCR_BUSY)) {
+               /* Some cards seem to need this */
+               mmc_go_idle(mmc);
+
+               start = get_timer(0);
+               while (1) {
+                       err = mmc_send_op_cond_iter(mmc, 1);
+                       if (err)
+                               return err;
+                       if (mmc->ocr & OCR_BUSY)
+                               break;
+                       if (get_timer(start) > timeout)
+                               return -EOPNOTSUPP;
+                       udelay(100);
+               }
+       }
 
        if (mmc_host_is_spi(mmc)) { /* read OCR for spi */
                cmd.cmdidx = MMC_CMD_SPI_READ_OCR;
@@ -424,10 +641,11 @@ static int mmc_complete_op_cond(struct mmc *mmc)
 
                if (err)
                        return err;
+
+               mmc->ocr = cmd.response[0];
        }
 
        mmc->version = MMC_VERSION_UNKNOWN;
-       mmc->ocr = cmd.response[0];
 
        mmc->high_capacity = ((mmc->ocr & OCR_HCS) == OCR_HCS);
        mmc->rca = 1;
@@ -457,11 +675,11 @@ static int mmc_send_ext_csd(struct mmc *mmc, u8 *ext_csd)
        return err;
 }
 
-
-static int mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value)
+int mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value)
 {
        struct mmc_cmd cmd;
        int timeout = 1000;
+       int retries = 3;
        int ret;
 
        cmd.cmdidx = MMC_CMD_SWITCH;
@@ -470,61 +688,98 @@ static int mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value)
                                 (index << 16) |
                                 (value << 8);
 
-       ret = mmc_send_cmd(mmc, &cmd, NULL);
+       while (retries > 0) {
+               ret = mmc_send_cmd(mmc, &cmd, NULL);
+
+               /* Waiting for the ready status */
+               if (!ret) {
+                       ret = mmc_send_status(mmc, timeout);
+                       return ret;
+               }
 
-       /* Waiting for the ready status */
-       if (!ret)
-               ret = mmc_send_status(mmc, timeout);
+               retries--;
+       }
 
        return ret;
 
 }
 
-static int mmc_change_freq(struct mmc *mmc)
+static int mmc_set_card_speed(struct mmc *mmc, enum bus_mode mode)
 {
-       ALLOC_CACHE_ALIGN_BUFFER(u8, ext_csd, MMC_MAX_BLOCK_LEN);
-       char cardtype;
        int err;
+       int speed_bits;
 
-       mmc->card_caps = MMC_MODE_4BIT | MMC_MODE_8BIT;
-
-       if (mmc_host_is_spi(mmc))
-               return 0;
-
-       /* Only version 4 supports high-speed */
-       if (mmc->version < MMC_VERSION_4)
-               return 0;
-
-       err = mmc_send_ext_csd(mmc, ext_csd);
+       ALLOC_CACHE_ALIGN_BUFFER(u8, test_csd, MMC_MAX_BLOCK_LEN);
 
+       switch (mode) {
+       case MMC_HS:
+       case MMC_HS_52:
+       case MMC_DDR_52:
+               speed_bits = EXT_CSD_TIMING_HS;
+               break;
+       case MMC_HS_200:
+               speed_bits = EXT_CSD_TIMING_HS200;
+               break;
+       case MMC_LEGACY:
+               speed_bits = EXT_CSD_TIMING_LEGACY;
+               break;
+       default:
+               return -EINVAL;
+       }
+       err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_HS_TIMING,
+                        speed_bits);
        if (err)
                return err;
 
-       cardtype = ext_csd[EXT_CSD_CARD_TYPE] & 0xf;
+       if ((mode == MMC_HS) || (mode == MMC_HS_52)) {
+               /* Now check to see that it worked */
+               err = mmc_send_ext_csd(mmc, test_csd);
+               if (err)
+                       return err;
+
+               /* No high-speed support */
+               if (!test_csd[EXT_CSD_HS_TIMING])
+                       return -ENOTSUPP;
+       }
 
-       err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_HS_TIMING, 1);
+       return 0;
+}
 
-       if (err)
-               return err == SWITCH_ERR ? 0 : err;
+static int mmc_get_capabilities(struct mmc *mmc)
+{
+       u8 *ext_csd = mmc->ext_csd;
+       char cardtype;
 
-       /* Now check to see that it worked */
-       err = mmc_send_ext_csd(mmc, ext_csd);
+       mmc->card_caps = MMC_MODE_1BIT;
 
-       if (err)
-               return err;
+       if (mmc_host_is_spi(mmc))
+               return 0;
 
-       /* No high-speed support */
-       if (!ext_csd[EXT_CSD_HS_TIMING])
+       /* Only version 4 supports high-speed */
+       if (mmc->version < MMC_VERSION_4)
                return 0;
 
-       /* High Speed is set, there are two types: 52MHz and 26MHz */
+       if (!ext_csd) {
+               printf("No ext_csd found!\n"); /* this should enver happen */
+               return -ENOTSUPP;
+       }
+
+       mmc->card_caps |= MMC_MODE_4BIT | MMC_MODE_8BIT;
+
+       cardtype = ext_csd[EXT_CSD_CARD_TYPE] & 0x3f;
+       mmc->cardtype = cardtype;
+
+       if (cardtype & (EXT_CSD_CARD_TYPE_HS200_1_2V |
+                       EXT_CSD_CARD_TYPE_HS200_1_8V)) {
+               mmc->card_caps |= MMC_MODE_HS200;
+       }
        if (cardtype & EXT_CSD_CARD_TYPE_52) {
-               if (cardtype & EXT_CSD_CARD_TYPE_DDR_1_8V)
+               if (cardtype & EXT_CSD_CARD_TYPE_DDR_52)
                        mmc->card_caps |= MMC_MODE_DDR_52MHz;
-               mmc->card_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS;
-       } else {
-               mmc->card_caps |= MMC_MODE_HS;
+               mmc->card_caps |= MMC_MODE_HS_52MHz;
        }
+       if (cardtype & EXT_CSD_CARD_TYPE_26)
+               mmc->card_caps |= MMC_MODE_HS;
 
        return 0;
 }
@@ -552,44 +807,42 @@ static int mmc_set_capacity(struct mmc *mmc, int part_num)
                return -1;
        }
 
-       mmc->block_dev.lba = lldiv(mmc->capacity, mmc->read_bl_len);
+       mmc_get_blk_desc(mmc)->lba = lldiv(mmc->capacity, mmc->read_bl_len);
 
        return 0;
 }
 
-int mmc_select_hwpart(int dev_num, int hwpart)
+static int mmc_boot_part_access_chk(struct mmc *mmc, unsigned int part_num)
 {
-       struct mmc *mmc = find_mmc_device(dev_num);
-       int ret;
-
-       if (!mmc)
-               return -ENODEV;
-
-       if (mmc->part_num == hwpart)
-               return 0;
-
-       if (mmc->part_config == MMCPART_NOAVAILABLE) {
-               printf("Card doesn't support part_switch\n");
-               return -EMEDIUMTYPE;
+       int forbidden = 0;
+       bool change = false;
+
+       if (part_num & PART_ACCESS_MASK)
+               forbidden = MMC_CAP(MMC_HS_200);
+
+       if (MMC_CAP(mmc->selected_mode) & forbidden) {
+               debug("selected mode (%s) is forbidden for part %d\n",
+                     mmc_mode_name(mmc->selected_mode), part_num);
+               change = true;
+       } else if (mmc->selected_mode != mmc->best_mode) {
+               debug("selected mode is not optimal\n");
+               change = true;
        }
 
-       ret = mmc_switch_part(dev_num, hwpart);
-       if (ret)
-               return ret;
-
-       mmc->part_num = hwpart;
+       if (change)
+               return mmc_select_mode_and_width(mmc,
+                                                mmc->card_caps & ~forbidden);
 
        return 0;
 }
 
-
-int mmc_switch_part(int dev_num, unsigned int part_num)
+int mmc_switch_part(struct mmc *mmc, unsigned int part_num)
 {
-       struct mmc *mmc = find_mmc_device(dev_num);
        int ret;
 
-       if (!mmc)
-               return -1;
+       ret = mmc_boot_part_access_chk(mmc, part_num);
+       if (ret)
+               return ret;
 
        ret = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_PART_CONF,
                         (mmc->part_config & ~PART_ACCESS_MASK)
@@ -599,38 +852,236 @@ int mmc_switch_part(int dev_num, unsigned int part_num)
         * Set the capacity if the switch succeeded or was intended
         * to return to representing the raw device.
         */
-       if ((ret == 0) || ((ret == -ENODEV) && (part_num == 0)))
+       if ((ret == 0) || ((ret == -ENODEV) && (part_num == 0))) {
                ret = mmc_set_capacity(mmc, part_num);
+               mmc_get_blk_desc(mmc)->hwpart = part_num;
+       }
 
        return ret;
 }
 
-int mmc_getcd(struct mmc *mmc)
+int mmc_hwpart_config(struct mmc *mmc,
+                     const struct mmc_hwpart_conf *conf,
+                     enum mmc_hwpart_conf_mode mode)
 {
-       int cd;
+       u8 part_attrs = 0;
+       u32 enh_size_mult;
+       u32 enh_start_addr;
+       u32 gp_size_mult[4];
+       u32 max_enh_size_mult;
+       u32 tot_enh_size_mult = 0;
+       u8 wr_rel_set;
+       int i, pidx, err;
+       ALLOC_CACHE_ALIGN_BUFFER(u8, ext_csd, MMC_MAX_BLOCK_LEN);
 
-       cd = board_mmc_getcd(mmc);
+       if (mode < MMC_HWPART_CONF_CHECK || mode > MMC_HWPART_CONF_COMPLETE)
+               return -EINVAL;
 
-       if (cd < 0) {
-               if (mmc->cfg->ops->getcd)
-                       cd = mmc->cfg->ops->getcd(mmc);
-               else
-                       cd = 1;
+       if (IS_SD(mmc) || (mmc->version < MMC_VERSION_4_41)) {
+               printf("eMMC >= 4.4 required for enhanced user data area\n");
+               return -EMEDIUMTYPE;
        }
 
-       return cd;
-}
+       if (!(mmc->part_support & PART_SUPPORT)) {
+               printf("Card does not support partitioning\n");
+               return -EMEDIUMTYPE;
+       }
 
-static int sd_switch(struct mmc *mmc, int mode, int group, u8 value, u8 *resp)
-{
-       struct mmc_cmd cmd;
-       struct mmc_data data;
+       if (!mmc->hc_wp_grp_size) {
+               printf("Card does not define HC WP group size\n");
+               return -EMEDIUMTYPE;
+       }
 
-       /* Switch the frequency */
-       cmd.cmdidx = SD_CMD_SWITCH_FUNC;
-       cmd.resp_type = MMC_RSP_R1;
-       cmd.cmdarg = (mode << 31) | 0xffffff;
-       cmd.cmdarg &= ~(0xf << (group * 4));
+       /* check partition alignment and total enhanced size */
+       if (conf->user.enh_size) {
+               if (conf->user.enh_size % mmc->hc_wp_grp_size ||
+                   conf->user.enh_start % mmc->hc_wp_grp_size) {
+                       printf("User data enhanced area not HC WP group "
+                              "size aligned\n");
+                       return -EINVAL;
+               }
+               part_attrs |= EXT_CSD_ENH_USR;
+               enh_size_mult = conf->user.enh_size / mmc->hc_wp_grp_size;
+               if (mmc->high_capacity) {
+                       enh_start_addr = conf->user.enh_start;
+               } else {
+                       enh_start_addr = (conf->user.enh_start << 9);
+               }
+       } else {
+               enh_size_mult = 0;
+               enh_start_addr = 0;
+       }
+       tot_enh_size_mult += enh_size_mult;
+
+       for (pidx = 0; pidx < 4; pidx++) {
+               if (conf->gp_part[pidx].size % mmc->hc_wp_grp_size) {
+                       printf("GP%i partition not HC WP group size "
+                              "aligned\n", pidx+1);
+                       return -EINVAL;
+               }
+               gp_size_mult[pidx] = conf->gp_part[pidx].size / mmc->hc_wp_grp_size;
+               if (conf->gp_part[pidx].size && conf->gp_part[pidx].enhanced) {
+                       part_attrs |= EXT_CSD_ENH_GP(pidx);
+                       tot_enh_size_mult += gp_size_mult[pidx];
+               }
+       }
+
+       if (part_attrs && ! (mmc->part_support & ENHNCD_SUPPORT)) {
+               printf("Card does not support enhanced attribute\n");
+               return -EMEDIUMTYPE;
+       }
+
+       err = mmc_send_ext_csd(mmc, ext_csd);
+       if (err)
+               return err;
+
+       max_enh_size_mult =
+               (ext_csd[EXT_CSD_MAX_ENH_SIZE_MULT+2] << 16) +
+               (ext_csd[EXT_CSD_MAX_ENH_SIZE_MULT+1] << 8) +
+               ext_csd[EXT_CSD_MAX_ENH_SIZE_MULT];
+       if (tot_enh_size_mult > max_enh_size_mult) {
+               printf("Total enhanced size exceeds maximum (%u > %u)\n",
+                      tot_enh_size_mult, max_enh_size_mult);
+               return -EMEDIUMTYPE;
+       }
+
+       /* The default value of EXT_CSD_WR_REL_SET is device
+        * dependent, the values can only be changed if the
+        * EXT_CSD_HS_CTRL_REL bit is set. The values can be
+        * changed only once and before partitioning is completed. */
+       wr_rel_set = ext_csd[EXT_CSD_WR_REL_SET];
+       if (conf->user.wr_rel_change) {
+               if (conf->user.wr_rel_set)
+                       wr_rel_set |= EXT_CSD_WR_DATA_REL_USR;
+               else
+                       wr_rel_set &= ~EXT_CSD_WR_DATA_REL_USR;
+       }
+       for (pidx = 0; pidx < 4; pidx++) {
+               if (conf->gp_part[pidx].wr_rel_change) {
+                       if (conf->gp_part[pidx].wr_rel_set)
+                               wr_rel_set |= EXT_CSD_WR_DATA_REL_GP(pidx);
+                       else
+                               wr_rel_set &= ~EXT_CSD_WR_DATA_REL_GP(pidx);
+               }
+       }
+
+       if (wr_rel_set != ext_csd[EXT_CSD_WR_REL_SET] &&
+           !(ext_csd[EXT_CSD_WR_REL_PARAM] & EXT_CSD_HS_CTRL_REL)) {
+               puts("Card does not support host controlled partition write "
+                    "reliability settings\n");
+               return -EMEDIUMTYPE;
+       }
+
+       if (ext_csd[EXT_CSD_PARTITION_SETTING] &
+           EXT_CSD_PARTITION_SETTING_COMPLETED) {
+               printf("Card already partitioned\n");
+               return -EPERM;
+       }
+
+       if (mode == MMC_HWPART_CONF_CHECK)
+               return 0;
+
+       /* Partitioning requires high-capacity size definitions */
+       if (!(ext_csd[EXT_CSD_ERASE_GROUP_DEF] & 0x01)) {
+               err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
+                                EXT_CSD_ERASE_GROUP_DEF, 1);
+
+               if (err)
+                       return err;
+
+               ext_csd[EXT_CSD_ERASE_GROUP_DEF] = 1;
+
+               /* update erase group size to be high-capacity */
+               mmc->erase_grp_size =
+                       ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE] * 1024;
+
+       }
+
+       /* all OK, write the configuration */
+       for (i = 0; i < 4; i++) {
+               err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
+                                EXT_CSD_ENH_START_ADDR+i,
+                                (enh_start_addr >> (i*8)) & 0xFF);
+               if (err)
+                       return err;
+       }
+       for (i = 0; i < 3; i++) {
+               err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
+                                EXT_CSD_ENH_SIZE_MULT+i,
+                                (enh_size_mult >> (i*8)) & 0xFF);
+               if (err)
+                       return err;
+       }
+       for (pidx = 0; pidx < 4; pidx++) {
+               for (i = 0; i < 3; i++) {
+                       err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
+                                        EXT_CSD_GP_SIZE_MULT+pidx*3+i,
+                                        (gp_size_mult[pidx] >> (i*8)) & 0xFF);
+                       if (err)
+                               return err;
+               }
+       }
+       err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
+                        EXT_CSD_PARTITIONS_ATTRIBUTE, part_attrs);
+       if (err)
+               return err;
+
+       if (mode == MMC_HWPART_CONF_SET)
+               return 0;
+
+       /* The WR_REL_SET is a write-once register but shall be
+        * written before setting PART_SETTING_COMPLETED. As it is
+        * write-once we can only write it when completing the
+        * partitioning. */
+       if (wr_rel_set != ext_csd[EXT_CSD_WR_REL_SET]) {
+               err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
+                                EXT_CSD_WR_REL_SET, wr_rel_set);
+               if (err)
+                       return err;
+       }
+
+       /* Setting PART_SETTING_COMPLETED confirms the partition
+        * configuration but it only becomes effective after power
+        * cycle, so we do not adjust the partition related settings
+        * in the mmc struct. */
+
+       err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
+                        EXT_CSD_PARTITION_SETTING,
+                        EXT_CSD_PARTITION_SETTING_COMPLETED);
+       if (err)
+               return err;
+
+       return 0;
+}
+
+#if !CONFIG_IS_ENABLED(DM_MMC)
+int mmc_getcd(struct mmc *mmc)
+{
+       int cd;
+
+       cd = board_mmc_getcd(mmc);
+
+       if (cd < 0) {
+               if (mmc->cfg->ops->getcd)
+                       cd = mmc->cfg->ops->getcd(mmc);
+               else
+                       cd = 1;
+       }
+
+       return cd;
+}
+#endif
+
+static int sd_switch(struct mmc *mmc, int mode, int group, u8 value, u8 *resp)
+{
+       struct mmc_cmd cmd;
+       struct mmc_data data;
+
+       /* Switch the frequency */
+       cmd.cmdidx = SD_CMD_SWITCH_FUNC;
+       cmd.resp_type = MMC_RSP_R1;
+       cmd.cmdarg = (mode << 31) | 0xffffff;
+       cmd.cmdarg &= ~(0xf << (group * 4));
        cmd.cmdarg |= value << (group * 4);
 
        data.dest = (char *)resp;
@@ -642,16 +1093,17 @@ static int sd_switch(struct mmc *mmc, int mode, int group, u8 value, u8 *resp)
 }
 
 
-static int sd_change_freq(struct mmc *mmc)
+static int sd_get_capabilities(struct mmc *mmc)
 {
        int err;
        struct mmc_cmd cmd;
-       ALLOC_CACHE_ALIGN_BUFFER(uint, scr, 2);
-       ALLOC_CACHE_ALIGN_BUFFER(uint, switch_status, 16);
+       ALLOC_CACHE_ALIGN_BUFFER(__be32, scr, 2);
+       ALLOC_CACHE_ALIGN_BUFFER(__be32, switch_status, 16);
        struct mmc_data data;
        int timeout;
+       u32 sd3_bus_mode;
 
-       mmc->card_caps = 0;
+       mmc->card_caps = MMC_MODE_1BIT;
 
        if (mmc_host_is_spi(mmc))
                return 0;
@@ -691,20 +1143,20 @@ retry_scr:
        mmc->scr[1] = __be32_to_cpu(scr[1]);
 
        switch ((mmc->scr[0] >> 24) & 0xf) {
-               case 0:
-                       mmc->version = SD_VERSION_1_0;
-                       break;
-               case 1:
-                       mmc->version = SD_VERSION_1_10;
-                       break;
-               case 2:
-                       mmc->version = SD_VERSION_2;
-                       if ((mmc->scr[0] >> 15) & 0x1)
-                               mmc->version = SD_VERSION_3;
-                       break;
-               default:
-                       mmc->version = SD_VERSION_1_0;
-                       break;
+       case 0:
+               mmc->version = SD_VERSION_1_0;
+               break;
+       case 1:
+               mmc->version = SD_VERSION_1_10;
+               break;
+       case 2:
+               mmc->version = SD_VERSION_2;
+               if ((mmc->scr[0] >> 15) & 0x1)
+                       mmc->version = SD_VERSION_3;
+               break;
+       default:
+               mmc->version = SD_VERSION_1_0;
+               break;
        }
 
        if (mmc->scr[0] & SD_DATA_4BIT)
@@ -728,26 +1180,148 @@ retry_scr:
        }
 
        /* If high-speed isn't supported, we return */
-       if (!(__be32_to_cpu(switch_status[3]) & SD_HIGHSPEED_SUPPORTED))
-               return 0;
+       if (__be32_to_cpu(switch_status[3]) & SD_HIGHSPEED_SUPPORTED)
+               mmc->card_caps |= MMC_CAP(SD_HS);
 
-       /*
-        * If the host doesn't support SD_HIGHSPEED, do not switch card to
-        * HIGHSPEED mode even if the card support SD_HIGHSPPED.
-        * This can avoid furthur problem when the card runs in different
-        * mode between the host.
-        */
-       if (!((mmc->cfg->host_caps & MMC_MODE_HS_52MHz) &&
-               (mmc->cfg->host_caps & MMC_MODE_HS)))
+       /* Version before 3.0 don't support UHS modes */
+       if (mmc->version < SD_VERSION_3)
                return 0;
 
-       err = sd_switch(mmc, SD_SWITCH_SWITCH, 0, 1, (u8 *)switch_status);
+       sd3_bus_mode = __be32_to_cpu(switch_status[3]) >> 16 & 0x1f;
+       if (sd3_bus_mode & SD_MODE_UHS_SDR104)
+               mmc->card_caps |= MMC_CAP(UHS_SDR104);
+       if (sd3_bus_mode & SD_MODE_UHS_SDR50)
+               mmc->card_caps |= MMC_CAP(UHS_SDR50);
+       if (sd3_bus_mode & SD_MODE_UHS_SDR25)
+               mmc->card_caps |= MMC_CAP(UHS_SDR25);
+       if (sd3_bus_mode & SD_MODE_UHS_SDR12)
+               mmc->card_caps |= MMC_CAP(UHS_SDR12);
+       if (sd3_bus_mode & SD_MODE_UHS_DDR50)
+               mmc->card_caps |= MMC_CAP(UHS_DDR50);
+
+       return 0;
+}
 
+static int sd_set_card_speed(struct mmc *mmc, enum bus_mode mode)
+{
+       int err;
+
+       ALLOC_CACHE_ALIGN_BUFFER(uint, switch_status, 16);
+       int speed;
+
+       switch (mode) {
+       case SD_LEGACY:
+       case UHS_SDR12:
+               speed = UHS_SDR12_BUS_SPEED;
+               break;
+       case SD_HS:
+       case UHS_SDR25:
+               speed = UHS_SDR25_BUS_SPEED;
+               break;
+       case UHS_SDR50:
+               speed = UHS_SDR50_BUS_SPEED;
+               break;
+       case UHS_DDR50:
+               speed = UHS_DDR50_BUS_SPEED;
+               break;
+       case UHS_SDR104:
+               speed = UHS_SDR104_BUS_SPEED;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       err = sd_switch(mmc, SD_SWITCH_SWITCH, 0, speed, (u8 *)switch_status);
        if (err)
                return err;
 
-       if ((__be32_to_cpu(switch_status[4]) & 0x0f000000) == 0x01000000)
-               mmc->card_caps |= MMC_MODE_HS;
+       if ((__be32_to_cpu(switch_status[4]) >> 24) != speed)
+               return -ENOTSUPP;
+
+       return 0;
+}
+
+int sd_select_bus_width(struct mmc *mmc, int w)
+{
+       int err;
+       struct mmc_cmd cmd;
+
+       if ((w != 4) && (w != 1))
+               return -EINVAL;
+
+       cmd.cmdidx = MMC_CMD_APP_CMD;
+       cmd.resp_type = MMC_RSP_R1;
+       cmd.cmdarg = mmc->rca << 16;
+
+       err = mmc_send_cmd(mmc, &cmd, NULL);
+       if (err)
+               return err;
+
+       cmd.cmdidx = SD_CMD_APP_SET_BUS_WIDTH;
+       cmd.resp_type = MMC_RSP_R1;
+       if (w == 4)
+               cmd.cmdarg = 2;
+       else if (w == 1)
+               cmd.cmdarg = 0;
+       err = mmc_send_cmd(mmc, &cmd, NULL);
+       if (err)
+               return err;
+
+       return 0;
+}
+
+static int sd_read_ssr(struct mmc *mmc)
+{
+       int err, i;
+       struct mmc_cmd cmd;
+       ALLOC_CACHE_ALIGN_BUFFER(uint, ssr, 16);
+       struct mmc_data data;
+       int timeout = 3;
+       unsigned int au, eo, et, es;
+
+       cmd.cmdidx = MMC_CMD_APP_CMD;
+       cmd.resp_type = MMC_RSP_R1;
+       cmd.cmdarg = mmc->rca << 16;
+
+       err = mmc_send_cmd(mmc, &cmd, NULL);
+       if (err)
+               return err;
+
+       cmd.cmdidx = SD_CMD_APP_SD_STATUS;
+       cmd.resp_type = MMC_RSP_R1;
+       cmd.cmdarg = 0;
+
+retry_ssr:
+       data.dest = (char *)ssr;
+       data.blocksize = 64;
+       data.blocks = 1;
+       data.flags = MMC_DATA_READ;
+
+       err = mmc_send_cmd(mmc, &cmd, &data);
+       if (err) {
+               if (timeout--)
+                       goto retry_ssr;
+
+               return err;
+       }
+
+       for (i = 0; i < 16; i++)
+               ssr[i] = be32_to_cpu(ssr[i]);
+
+       au = (ssr[2] >> 12) & 0xF;
+       if ((au <= 9) || (mmc->version == SD_VERSION_3)) {
+               mmc->ssr.au = sd_au_size[au];
+               es = (ssr[3] >> 24) & 0xFF;
+               es |= (ssr[2] & 0xFF) << 8;
+               et = (ssr[3] >> 18) & 0x3F;
+               if (es && et) {
+                       eo = (ssr[3] >> 16) & 0x3;
+                       mmc->ssr.erase_timeout = (et * 1000) / es;
+                       mmc->ssr.erase_offset = eo * 1000;
+               }
+       } else {
+               debug("Invalid Allocation Unit Size.\n");
+       }
 
        return 0;
 }
@@ -764,7 +1338,7 @@ static const int fbase[] = {
 /* Multiplier values for TRAN_SPEED.  Multiplied by 10 to be nice
  * to platforms without floating point.
  */
-static const int multipliers[] = {
+static const u8 multipliers[] = {
        0,      /* reserved */
        10,
        12,
@@ -783,13 +1357,40 @@ static const int multipliers[] = {
        80,
 };
 
-static void mmc_set_ios(struct mmc *mmc)
+static inline int bus_width(uint cap)
+{
+       if (cap == MMC_MODE_8BIT)
+               return 8;
+       if (cap == MMC_MODE_4BIT)
+               return 4;
+       if (cap == MMC_MODE_1BIT)
+               return 1;
+       printf("invalid bus witdh capability 0x%x\n", cap);
+       return 0;
+}
+
+#if !CONFIG_IS_ENABLED(DM_MMC)
+static int mmc_execute_tuning(struct mmc *mmc, uint opcode)
 {
+       return -ENOTSUPP;
+}
+
+static void mmc_send_init_stream(struct mmc *mmc)
+{
+}
+
+static int mmc_set_ios(struct mmc *mmc)
+{
+       int ret = 0;
+
        if (mmc->cfg->ops->set_ios)
-               mmc->cfg->ops->set_ios(mmc);
+               ret = mmc->cfg->ops->set_ios(mmc);
+
+       return ret;
 }
+#endif
 
-void mmc_set_clock(struct mmc *mmc, uint clock)
+int mmc_set_clock(struct mmc *mmc, uint clock, bool disable)
 {
        if (clock > mmc->cfg->f_max)
                clock = mmc->cfg->f_max;
@@ -798,26 +1399,565 @@ void mmc_set_clock(struct mmc *mmc, uint clock)
                clock = mmc->cfg->f_min;
 
        mmc->clock = clock;
+       mmc->clk_disable = disable;
 
-       mmc_set_ios(mmc);
+       return mmc_set_ios(mmc);
 }
 
-static void mmc_set_bus_width(struct mmc *mmc, uint width)
+static int mmc_set_bus_width(struct mmc *mmc, uint width)
 {
        mmc->bus_width = width;
 
-       mmc_set_ios(mmc);
+       return mmc_set_ios(mmc);
+}
+
+#if CONFIG_IS_ENABLED(MMC_VERBOSE) || defined(DEBUG)
+/*
+ * helper function to display the capabilities in a human
+ * friendly manner. The capabilities include bus width and
+ * supported modes.
+ */
+void mmc_dump_capabilities(const char *text, uint caps)
+{
+       enum bus_mode mode;
+
+       printf("%s: widths [", text);
+       if (caps & MMC_MODE_8BIT)
+               printf("8, ");
+       if (caps & MMC_MODE_4BIT)
+               printf("4, ");
+       if (caps & MMC_MODE_1BIT)
+               printf("1, ");
+       printf("\b\b] modes [");
+       for (mode = MMC_LEGACY; mode < MMC_MODES_END; mode++)
+               if (MMC_CAP(mode) & caps)
+                       printf("%s, ", mmc_mode_name(mode));
+       printf("\b\b]\n");
+}
+#endif
+
+struct mode_width_tuning {
+       enum bus_mode mode;
+       uint widths;
+       uint tuning;
+};
+
+int mmc_voltage_to_mv(enum mmc_voltage voltage)
+{
+       switch (voltage) {
+       case MMC_SIGNAL_VOLTAGE_000: return 0;
+       case MMC_SIGNAL_VOLTAGE_330: return 3300;
+       case MMC_SIGNAL_VOLTAGE_180: return 1800;
+       case MMC_SIGNAL_VOLTAGE_120: return 1200;
+       }
+       return -EINVAL;
+}
+
+static int mmc_set_signal_voltage(struct mmc *mmc, uint signal_voltage)
+{
+       int err;
+
+       if (mmc->signal_voltage == signal_voltage)
+               return 0;
+
+       mmc->signal_voltage = signal_voltage;
+       err = mmc_set_ios(mmc);
+       if (err)
+               debug("unable to set voltage (err %d)\n", err);
+
+       return err;
+}
+
+static const struct mode_width_tuning sd_modes_by_pref[] = {
+       {
+               .mode = UHS_SDR104,
+               .widths = MMC_MODE_4BIT | MMC_MODE_1BIT,
+               .tuning = MMC_CMD_SEND_TUNING_BLOCK
+       },
+       {
+               .mode = UHS_SDR50,
+               .widths = MMC_MODE_4BIT | MMC_MODE_1BIT,
+       },
+       {
+               .mode = UHS_DDR50,
+               .widths = MMC_MODE_4BIT | MMC_MODE_1BIT,
+       },
+       {
+               .mode = UHS_SDR25,
+               .widths = MMC_MODE_4BIT | MMC_MODE_1BIT,
+       },
+       {
+               .mode = SD_HS,
+               .widths = MMC_MODE_4BIT | MMC_MODE_1BIT,
+       },
+       {
+               .mode = UHS_SDR12,
+               .widths = MMC_MODE_4BIT | MMC_MODE_1BIT,
+       },
+       {
+               .mode = SD_LEGACY,
+               .widths = MMC_MODE_4BIT | MMC_MODE_1BIT,
+       }
+};
+
+#define for_each_sd_mode_by_pref(caps, mwt) \
+       for (mwt = sd_modes_by_pref;\
+            mwt < sd_modes_by_pref + ARRAY_SIZE(sd_modes_by_pref);\
+            mwt++) \
+               if (caps & MMC_CAP(mwt->mode))
+
+static int sd_select_mode_and_width(struct mmc *mmc, uint card_caps)
+{
+       int err;
+       uint widths[] = {MMC_MODE_4BIT, MMC_MODE_1BIT};
+       const struct mode_width_tuning *mwt;
+       bool uhs_en = (mmc->ocr & OCR_S18R) ? true : false;
+       uint caps;
+
+
+       /* Restrict card's capabilities by what the host can do */
+       caps = card_caps & (mmc->host_caps | MMC_MODE_1BIT);
+
+       if (!uhs_en)
+               caps &= ~UHS_CAPS;
+
+       for_each_sd_mode_by_pref(caps, mwt) {
+               uint *w;
+
+               for (w = widths; w < widths + ARRAY_SIZE(widths); w++) {
+                       if (*w & caps & mwt->widths) {
+                               debug("trying mode %s width %d (at %d MHz)\n",
+                                     mmc_mode_name(mwt->mode),
+                                     bus_width(*w),
+                                     mmc_mode2freq(mmc, mwt->mode) / 1000000);
+
+                               /* configure the bus width (card + host) */
+                               err = sd_select_bus_width(mmc, bus_width(*w));
+                               if (err)
+                                       goto error;
+                               mmc_set_bus_width(mmc, bus_width(*w));
+
+                               /* configure the bus mode (card) */
+                               err = sd_set_card_speed(mmc, mwt->mode);
+                               if (err)
+                                       goto error;
+
+                               /* configure the bus mode (host) */
+                               mmc_select_mode(mmc, mwt->mode);
+                               mmc_set_clock(mmc, mmc->tran_speed, false);
+
+                               /* execute tuning if needed */
+                               if (mwt->tuning && !mmc_host_is_spi(mmc)) {
+                                       err = mmc_execute_tuning(mmc,
+                                                                mwt->tuning);
+                                       if (err) {
+                                               debug("tuning failed\n");
+                                               goto error;
+                                       }
+                               }
+
+                               err = sd_read_ssr(mmc);
+                               if (!err)
+                                       return 0;
+
+                               printf("bad ssr\n");
+
+error:
+                               /* revert to a safer bus speed */
+                               mmc_select_mode(mmc, SD_LEGACY);
+                               mmc_set_clock(mmc, mmc->tran_speed, false);
+                       }
+               }
+       }
+
+       printf("unable to select a mode\n");
+       return -ENOTSUPP;
+}
+
+/*
+ * read the compare the part of ext csd that is constant.
+ * This can be used to check that the transfer is working
+ * as expected.
+ */
+static int mmc_read_and_compare_ext_csd(struct mmc *mmc)
+{
+       int err;
+       const u8 *ext_csd = mmc->ext_csd;
+       ALLOC_CACHE_ALIGN_BUFFER(u8, test_csd, MMC_MAX_BLOCK_LEN);
+
+       err = mmc_send_ext_csd(mmc, test_csd);
+       if (err)
+               return err;
+
+       /* Only compare read only fields */
+       if (ext_csd[EXT_CSD_PARTITIONING_SUPPORT]
+               == test_csd[EXT_CSD_PARTITIONING_SUPPORT] &&
+           ext_csd[EXT_CSD_HC_WP_GRP_SIZE]
+               == test_csd[EXT_CSD_HC_WP_GRP_SIZE] &&
+           ext_csd[EXT_CSD_REV]
+               == test_csd[EXT_CSD_REV] &&
+           ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE]
+               == test_csd[EXT_CSD_HC_ERASE_GRP_SIZE] &&
+           memcmp(&ext_csd[EXT_CSD_SEC_CNT],
+                  &test_csd[EXT_CSD_SEC_CNT], 4) == 0)
+               return 0;
+
+       return -EBADMSG;
+}
+
+static int mmc_set_lowest_voltage(struct mmc *mmc, enum bus_mode mode,
+                                 uint32_t allowed_mask)
+{
+       u32 card_mask = 0;
+
+       switch (mode) {
+       case MMC_HS_200:
+               if (mmc->cardtype & EXT_CSD_CARD_TYPE_HS200_1_8V)
+                       card_mask |= MMC_SIGNAL_VOLTAGE_180;
+               if (mmc->cardtype & EXT_CSD_CARD_TYPE_HS200_1_2V)
+                       card_mask |= MMC_SIGNAL_VOLTAGE_120;
+               break;
+       case MMC_DDR_52:
+               if (mmc->cardtype & EXT_CSD_CARD_TYPE_DDR_1_8V)
+                       card_mask |= MMC_SIGNAL_VOLTAGE_330 |
+                                    MMC_SIGNAL_VOLTAGE_180;
+               if (mmc->cardtype & EXT_CSD_CARD_TYPE_DDR_1_2V)
+                       card_mask |= MMC_SIGNAL_VOLTAGE_120;
+               break;
+       default:
+               card_mask |= MMC_SIGNAL_VOLTAGE_330;
+               break;
+       }
+
+       while (card_mask & allowed_mask) {
+               enum mmc_voltage best_match;
+
+               best_match = 1 << (ffs(card_mask & allowed_mask) - 1);
+               if (!mmc_set_signal_voltage(mmc,  best_match))
+                       return 0;
+
+               allowed_mask &= ~best_match;
+       }
+
+       return -ENOTSUPP;
+}
+
+static const struct mode_width_tuning mmc_modes_by_pref[] = {
+       {
+               .mode = MMC_HS_200,
+               .widths = MMC_MODE_8BIT | MMC_MODE_4BIT,
+               .tuning = MMC_CMD_SEND_TUNING_BLOCK_HS200
+       },
+       {
+               .mode = MMC_DDR_52,
+               .widths = MMC_MODE_8BIT | MMC_MODE_4BIT,
+       },
+       {
+               .mode = MMC_HS_52,
+               .widths = MMC_MODE_8BIT | MMC_MODE_4BIT | MMC_MODE_1BIT,
+       },
+       {
+               .mode = MMC_HS,
+               .widths = MMC_MODE_8BIT | MMC_MODE_4BIT | MMC_MODE_1BIT,
+       },
+       {
+               .mode = MMC_LEGACY,
+               .widths = MMC_MODE_8BIT | MMC_MODE_4BIT | MMC_MODE_1BIT,
+       }
+};
+
+#define for_each_mmc_mode_by_pref(caps, mwt) \
+       for (mwt = mmc_modes_by_pref;\
+           mwt < mmc_modes_by_pref + ARRAY_SIZE(mmc_modes_by_pref);\
+           mwt++) \
+               if (caps & MMC_CAP(mwt->mode))
+
+static const struct ext_csd_bus_width {
+       uint cap;
+       bool is_ddr;
+       uint ext_csd_bits;
+} ext_csd_bus_width[] = {
+       {MMC_MODE_8BIT, true, EXT_CSD_DDR_BUS_WIDTH_8},
+       {MMC_MODE_4BIT, true, EXT_CSD_DDR_BUS_WIDTH_4},
+       {MMC_MODE_8BIT, false, EXT_CSD_BUS_WIDTH_8},
+       {MMC_MODE_4BIT, false, EXT_CSD_BUS_WIDTH_4},
+       {MMC_MODE_1BIT, false, EXT_CSD_BUS_WIDTH_1},
+};
+
+#define for_each_supported_width(caps, ddr, ecbv) \
+       for (ecbv = ext_csd_bus_width;\
+           ecbv < ext_csd_bus_width + ARRAY_SIZE(ext_csd_bus_width);\
+           ecbv++) \
+               if ((ddr == ecbv->is_ddr) && (caps & ecbv->cap))
+
+static int mmc_select_mode_and_width(struct mmc *mmc, uint card_caps)
+{
+       int err;
+       const struct mode_width_tuning *mwt;
+       const struct ext_csd_bus_width *ecbw;
+
+       /* Restrict card's capabilities by what the host can do */
+       card_caps &= (mmc->host_caps | MMC_MODE_1BIT);
+
+       /* Only version 4 of MMC supports wider bus widths */
+       if (mmc->version < MMC_VERSION_4)
+               return 0;
+
+       if (!mmc->ext_csd) {
+               debug("No ext_csd found!\n"); /* this should enver happen */
+               return -ENOTSUPP;
+       }
+
+       mmc_set_clock(mmc, mmc->legacy_speed, false);
+
+       for_each_mmc_mode_by_pref(card_caps, mwt) {
+               for_each_supported_width(card_caps & mwt->widths,
+                                        mmc_is_mode_ddr(mwt->mode), ecbw) {
+                       enum mmc_voltage old_voltage;
+                       debug("trying mode %s width %d (at %d MHz)\n",
+                             mmc_mode_name(mwt->mode),
+                             bus_width(ecbw->cap),
+                             mmc_mode2freq(mmc, mwt->mode) / 1000000);
+                       old_voltage = mmc->signal_voltage;
+                       err = mmc_set_lowest_voltage(mmc, mwt->mode,
+                                                    MMC_ALL_SIGNAL_VOLTAGE);
+                       if (err)
+                               continue;
+
+                       /* configure the bus width (card + host) */
+                       err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
+                                   EXT_CSD_BUS_WIDTH,
+                                   ecbw->ext_csd_bits & ~EXT_CSD_DDR_FLAG);
+                       if (err)
+                               goto error;
+                       mmc_set_bus_width(mmc, bus_width(ecbw->cap));
+
+                       /* configure the bus speed (card) */
+                       err = mmc_set_card_speed(mmc, mwt->mode);
+                       if (err)
+                               goto error;
+
+                       /*
+                        * configure the bus width AND the ddr mode (card)
+                        * The host side will be taken care of in the next step
+                        */
+                       if (ecbw->ext_csd_bits & EXT_CSD_DDR_FLAG) {
+                               err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
+                                                EXT_CSD_BUS_WIDTH,
+                                                ecbw->ext_csd_bits);
+                               if (err)
+                                       goto error;
+                       }
+
+                       /* configure the bus mode (host) */
+                       mmc_select_mode(mmc, mwt->mode);
+                       mmc_set_clock(mmc, mmc->tran_speed, false);
+
+                       /* execute tuning if needed */
+                       if (mwt->tuning) {
+                               err = mmc_execute_tuning(mmc, mwt->tuning);
+                               if (err) {
+                                       debug("tuning failed\n");
+                                       goto error;
+                               }
+                       }
+
+                       /* do a transfer to check the configuration */
+                       err = mmc_read_and_compare_ext_csd(mmc);
+                       if (!err)
+                               return 0;
+error:
+                       mmc_set_signal_voltage(mmc, old_voltage);
+                       /* if an error occured, revert to a safer bus mode */
+                       mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
+                                  EXT_CSD_BUS_WIDTH, EXT_CSD_BUS_WIDTH_1);
+                       mmc_select_mode(mmc, MMC_LEGACY);
+                       mmc_set_bus_width(mmc, 1);
+               }
+       }
+
+       printf("unable to select a mode\n");
+
+       return -ENOTSUPP;
+}
+
+static int mmc_startup_v4(struct mmc *mmc)
+{
+       int err, i;
+       u64 capacity;
+       bool has_parts = false;
+       bool part_completed;
+       u8 *ext_csd;
+
+       if (IS_SD(mmc) || (mmc->version < MMC_VERSION_4))
+               return 0;
+
+       ext_csd = malloc_cache_aligned(MMC_MAX_BLOCK_LEN);
+       if (!ext_csd)
+               return -ENOMEM;
+
+       mmc->ext_csd = ext_csd;
+
+       /* check  ext_csd version and capacity */
+       err = mmc_send_ext_csd(mmc, ext_csd);
+       if (err)
+               return err;
+       if (ext_csd[EXT_CSD_REV] >= 2) {
+               /*
+                * According to the JEDEC Standard, the value of
+                * ext_csd's capacity is valid if the value is more
+                * than 2GB
+                */
+               capacity = ext_csd[EXT_CSD_SEC_CNT] << 0
+                               | ext_csd[EXT_CSD_SEC_CNT + 1] << 8
+                               | ext_csd[EXT_CSD_SEC_CNT + 2] << 16
+                               | ext_csd[EXT_CSD_SEC_CNT + 3] << 24;
+               capacity *= MMC_MAX_BLOCK_LEN;
+               if ((capacity >> 20) > 2 * 1024)
+                       mmc->capacity_user = capacity;
+       }
+
+       switch (ext_csd[EXT_CSD_REV]) {
+       case 1:
+               mmc->version = MMC_VERSION_4_1;
+               break;
+       case 2:
+               mmc->version = MMC_VERSION_4_2;
+               break;
+       case 3:
+               mmc->version = MMC_VERSION_4_3;
+               break;
+       case 5:
+               mmc->version = MMC_VERSION_4_41;
+               break;
+       case 6:
+               mmc->version = MMC_VERSION_4_5;
+               break;
+       case 7:
+               mmc->version = MMC_VERSION_5_0;
+               break;
+       case 8:
+               mmc->version = MMC_VERSION_5_1;
+               break;
+       }
+
+       /* The partition data may be non-zero but it is only
+        * effective if PARTITION_SETTING_COMPLETED is set in
+        * EXT_CSD, so ignore any data if this bit is not set,
+        * except for enabling the high-capacity group size
+        * definition (see below).
+        */
+       part_completed = !!(ext_csd[EXT_CSD_PARTITION_SETTING] &
+                           EXT_CSD_PARTITION_SETTING_COMPLETED);
+
+       /* store the partition info of emmc */
+       mmc->part_support = ext_csd[EXT_CSD_PARTITIONING_SUPPORT];
+       if ((ext_csd[EXT_CSD_PARTITIONING_SUPPORT] & PART_SUPPORT) ||
+           ext_csd[EXT_CSD_BOOT_MULT])
+               mmc->part_config = ext_csd[EXT_CSD_PART_CONF];
+       if (part_completed &&
+           (ext_csd[EXT_CSD_PARTITIONING_SUPPORT] & ENHNCD_SUPPORT))
+               mmc->part_attr = ext_csd[EXT_CSD_PARTITIONS_ATTRIBUTE];
+
+       mmc->capacity_boot = ext_csd[EXT_CSD_BOOT_MULT] << 17;
+
+       mmc->capacity_rpmb = ext_csd[EXT_CSD_RPMB_MULT] << 17;
+
+       for (i = 0; i < 4; i++) {
+               int idx = EXT_CSD_GP_SIZE_MULT + i * 3;
+               uint mult = (ext_csd[idx + 2] << 16) +
+                       (ext_csd[idx + 1] << 8) + ext_csd[idx];
+               if (mult)
+                       has_parts = true;
+               if (!part_completed)
+                       continue;
+               mmc->capacity_gp[i] = mult;
+               mmc->capacity_gp[i] *=
+                       ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE];
+               mmc->capacity_gp[i] *= ext_csd[EXT_CSD_HC_WP_GRP_SIZE];
+               mmc->capacity_gp[i] <<= 19;
+       }
+
+       if (part_completed) {
+               mmc->enh_user_size =
+                       (ext_csd[EXT_CSD_ENH_SIZE_MULT + 2] << 16) +
+                       (ext_csd[EXT_CSD_ENH_SIZE_MULT + 1] << 8) +
+                       ext_csd[EXT_CSD_ENH_SIZE_MULT];
+               mmc->enh_user_size *= ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE];
+               mmc->enh_user_size *= ext_csd[EXT_CSD_HC_WP_GRP_SIZE];
+               mmc->enh_user_size <<= 19;
+               mmc->enh_user_start =
+                       (ext_csd[EXT_CSD_ENH_START_ADDR + 3] << 24) +
+                       (ext_csd[EXT_CSD_ENH_START_ADDR + 2] << 16) +
+                       (ext_csd[EXT_CSD_ENH_START_ADDR + 1] << 8) +
+                       ext_csd[EXT_CSD_ENH_START_ADDR];
+               if (mmc->high_capacity)
+                       mmc->enh_user_start <<= 9;
+       }
+
+       /*
+        * Host needs to enable ERASE_GRP_DEF bit if device is
+        * partitioned. This bit will be lost every time after a reset
+        * or power off. This will affect erase size.
+        */
+       if (part_completed)
+               has_parts = true;
+       if ((ext_csd[EXT_CSD_PARTITIONING_SUPPORT] & PART_SUPPORT) &&
+           (ext_csd[EXT_CSD_PARTITIONS_ATTRIBUTE] & PART_ENH_ATTRIB))
+               has_parts = true;
+       if (has_parts) {
+               err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
+                                EXT_CSD_ERASE_GROUP_DEF, 1);
+
+               if (err)
+                       return err;
+
+               ext_csd[EXT_CSD_ERASE_GROUP_DEF] = 1;
+       }
+
+       if (ext_csd[EXT_CSD_ERASE_GROUP_DEF] & 0x01) {
+               /* Read out group size from ext_csd */
+               mmc->erase_grp_size =
+                       ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE] * 1024;
+               /*
+                * if high capacity and partition setting completed
+                * SEC_COUNT is valid even if it is smaller than 2 GiB
+                * JEDEC Standard JESD84-B45, 6.2.4
+                */
+               if (mmc->high_capacity && part_completed) {
+                       capacity = (ext_csd[EXT_CSD_SEC_CNT]) |
+                               (ext_csd[EXT_CSD_SEC_CNT + 1] << 8) |
+                               (ext_csd[EXT_CSD_SEC_CNT + 2] << 16) |
+                               (ext_csd[EXT_CSD_SEC_CNT + 3] << 24);
+                       capacity *= MMC_MAX_BLOCK_LEN;
+                       mmc->capacity_user = capacity;
+               }
+       } else {
+               /* Calculate the group size from the csd value. */
+               int erase_gsz, erase_gmul;
+
+               erase_gsz = (mmc->csd[2] & 0x00007c00) >> 10;
+               erase_gmul = (mmc->csd[2] & 0x000003e0) >> 5;
+               mmc->erase_grp_size = (erase_gsz + 1)
+                       * (erase_gmul + 1);
+       }
+
+       mmc->hc_wp_grp_size = 1024
+               * ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE]
+               * ext_csd[EXT_CSD_HC_WP_GRP_SIZE];
+
+       mmc->wr_rel_set = ext_csd[EXT_CSD_WR_REL_SET];
+
+       return 0;
 }
 
 static int mmc_startup(struct mmc *mmc)
 {
        int err, i;
        uint mult, freq;
-       u64 cmult, csize, capacity;
+       u64 cmult, csize;
        struct mmc_cmd cmd;
-       ALLOC_CACHE_ALIGN_BUFFER(u8, ext_csd, MMC_MAX_BLOCK_LEN);
-       ALLOC_CACHE_ALIGN_BUFFER(u8, test_csd, MMC_MAX_BLOCK_LEN);
-       int timeout = 1000;
+       struct blk_desc *bdesc;
 
 #ifdef CONFIG_MMC_SPI_CRC_ON
        if (mmc_host_is_spi(mmc)) { /* enable CRC check for spi */
@@ -825,7 +1965,6 @@ static int mmc_startup(struct mmc *mmc)
                cmd.resp_type = MMC_RSP_R1;
                cmd.cmdarg = 1;
                err = mmc_send_cmd(mmc, &cmd, NULL);
-
                if (err)
                        return err;
        }
@@ -839,6 +1978,21 @@ static int mmc_startup(struct mmc *mmc)
 
        err = mmc_send_cmd(mmc, &cmd, NULL);
 
+#ifdef CONFIG_MMC_QUIRKS
+       if (err && (mmc->quirks & MMC_QUIRK_RETRY_SEND_CID)) {
+               int retries = 4;
+               /*
+                * It has been seen that SEND_CID may fail on the first
+                * attempt, let's try a few more time
+                */
+               do {
+                       err = mmc_send_cmd(mmc, &cmd, NULL);
+                       if (!err)
+                               break;
+               } while (retries--);
+       }
+#endif
+
        if (err)
                return err;
 
@@ -870,9 +2024,6 @@ static int mmc_startup(struct mmc *mmc)
 
        err = mmc_send_cmd(mmc, &cmd, NULL);
 
-       /* Waiting for the ready status */
-       mmc_send_status(mmc, timeout);
-
        if (err)
                return err;
 
@@ -885,24 +2036,24 @@ static int mmc_startup(struct mmc *mmc)
                int version = (cmd.response[0] >> 26) & 0xf;
 
                switch (version) {
-                       case 0:
-                               mmc->version = MMC_VERSION_1_2;
-                               break;
-                       case 1:
-                               mmc->version = MMC_VERSION_1_4;
-                               break;
-                       case 2:
-                               mmc->version = MMC_VERSION_2_2;
-                               break;
-                       case 3:
-                               mmc->version = MMC_VERSION_3;
-                               break;
-                       case 4:
-                               mmc->version = MMC_VERSION_4;
-                               break;
-                       default:
-                               mmc->version = MMC_VERSION_1_2;
-                               break;
+               case 0:
+                       mmc->version = MMC_VERSION_1_2;
+                       break;
+               case 1:
+                       mmc->version = MMC_VERSION_1_4;
+                       break;
+               case 2:
+                       mmc->version = MMC_VERSION_2_2;
+                       break;
+               case 3:
+                       mmc->version = MMC_VERSION_3;
+                       break;
+               case 4:
+                       mmc->version = MMC_VERSION_4;
+                       break;
+               default:
+                       mmc->version = MMC_VERSION_1_2;
+                       break;
                }
        }
 
@@ -910,7 +2061,8 @@ static int mmc_startup(struct mmc *mmc)
        freq = fbase[(cmd.response[0] & 0x7)];
        mult = multipliers[((cmd.response[0] >> 3) & 0xf)];
 
-       mmc->tran_speed = freq * mult;
+       mmc->legacy_speed = freq * mult;
+       mmc_select_mode(mmc, MMC_LEGACY);
 
        mmc->dsr_imp = ((cmd.response[1] >> 12) & 0x1);
        mmc->read_bl_len = 1 << ((cmd.response[1] >> 16) & 0xf);
@@ -967,250 +2119,65 @@ static int mmc_startup(struct mmc *mmc)
         */
        mmc->erase_grp_size = 1;
        mmc->part_config = MMCPART_NOAVAILABLE;
-       if (!IS_SD(mmc) && (mmc->version >= MMC_VERSION_4)) {
-               /* check  ext_csd version and capacity */
-               err = mmc_send_ext_csd(mmc, ext_csd);
-               if (!err && (ext_csd[EXT_CSD_REV] >= 2)) {
-                       /*
-                        * According to the JEDEC Standard, the value of
-                        * ext_csd's capacity is valid if the value is more
-                        * than 2GB
-                        */
-                       capacity = ext_csd[EXT_CSD_SEC_CNT] << 0
-                                       | ext_csd[EXT_CSD_SEC_CNT + 1] << 8
-                                       | ext_csd[EXT_CSD_SEC_CNT + 2] << 16
-                                       | ext_csd[EXT_CSD_SEC_CNT + 3] << 24;
-                       capacity *= MMC_MAX_BLOCK_LEN;
-                       if ((capacity >> 20) > 2 * 1024)
-                               mmc->capacity_user = capacity;
-               }
-
-               switch (ext_csd[EXT_CSD_REV]) {
-               case 1:
-                       mmc->version = MMC_VERSION_4_1;
-                       break;
-               case 2:
-                       mmc->version = MMC_VERSION_4_2;
-                       break;
-               case 3:
-                       mmc->version = MMC_VERSION_4_3;
-                       break;
-               case 5:
-                       mmc->version = MMC_VERSION_4_41;
-                       break;
-               case 6:
-                       mmc->version = MMC_VERSION_4_5;
-                       break;
-               case 7:
-                       mmc->version = MMC_VERSION_5_0;
-                       break;
-               }
-
-               /*
-                * Host needs to enable ERASE_GRP_DEF bit if device is
-                * partitioned. This bit will be lost every time after a reset
-                * or power off. This will affect erase size.
-                */
-               if ((ext_csd[EXT_CSD_PARTITIONING_SUPPORT] & PART_SUPPORT) &&
-                   (ext_csd[EXT_CSD_PARTITIONS_ATTRIBUTE] & PART_ENH_ATTRIB)) {
-                       err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
-                               EXT_CSD_ERASE_GROUP_DEF, 1);
-
-                       if (err)
-                               return err;
-                       else
-                               ext_csd[EXT_CSD_ERASE_GROUP_DEF] = 1;
-
-                       /* Read out group size from ext_csd */
-                       mmc->erase_grp_size =
-                               ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE] *
-                                       MMC_MAX_BLOCK_LEN * 1024;
-                       /*
-                        * if high capacity and partition setting completed
-                        * SEC_COUNT is valid even if it is smaller than 2 GiB
-                        * JEDEC Standard JESD84-B45, 6.2.4
-                        */
-                       if (mmc->high_capacity &&
-                           (ext_csd[EXT_CSD_PARTITION_SETTING] &
-                            EXT_CSD_PARTITION_SETTING_COMPLETED)) {
-                               capacity = (ext_csd[EXT_CSD_SEC_CNT]) |
-                                       (ext_csd[EXT_CSD_SEC_CNT + 1] << 8) |
-                                       (ext_csd[EXT_CSD_SEC_CNT + 2] << 16) |
-                                       (ext_csd[EXT_CSD_SEC_CNT + 3] << 24);
-                               capacity *= MMC_MAX_BLOCK_LEN;
-                               mmc->capacity_user = capacity;
-                       }
-               } else {
-                       /* Calculate the group size from the csd value. */
-                       int erase_gsz, erase_gmul;
-                       erase_gsz = (mmc->csd[2] & 0x00007c00) >> 10;
-                       erase_gmul = (mmc->csd[2] & 0x000003e0) >> 5;
-                       mmc->erase_grp_size = (erase_gsz + 1)
-                               * (erase_gmul + 1);
-               }
-
-               /* store the partition info of emmc */
-               if ((ext_csd[EXT_CSD_PARTITIONING_SUPPORT] & PART_SUPPORT) ||
-                   ext_csd[EXT_CSD_BOOT_MULT])
-                       mmc->part_config = ext_csd[EXT_CSD_PART_CONF];
-
-               mmc->capacity_boot = ext_csd[EXT_CSD_BOOT_MULT] << 17;
-
-               mmc->capacity_rpmb = ext_csd[EXT_CSD_RPMB_MULT] << 17;
 
-               for (i = 0; i < 4; i++) {
-                       int idx = EXT_CSD_GP_SIZE_MULT + i * 3;
-                       mmc->capacity_gp[i] = (ext_csd[idx + 2] << 16) +
-                               (ext_csd[idx + 1] << 8) + ext_csd[idx];
-                       mmc->capacity_gp[i] *=
-                               ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE];
-                       mmc->capacity_gp[i] *= ext_csd[EXT_CSD_HC_WP_GRP_SIZE];
-               }
-       }
-
-       err = mmc_set_capacity(mmc, mmc->part_num);
+       err = mmc_startup_v4(mmc);
        if (err)
                return err;
 
-       if (IS_SD(mmc))
-               err = sd_change_freq(mmc);
-       else
-               err = mmc_change_freq(mmc);
-
+       err = mmc_set_capacity(mmc, mmc_get_blk_desc(mmc)->hwpart);
        if (err)
                return err;
 
-       /* Restrict card's capabilities by what the host can do */
-       mmc->card_caps &= mmc->cfg->host_caps;
-
        if (IS_SD(mmc)) {
-               if (mmc->card_caps & MMC_MODE_4BIT) {
-                       cmd.cmdidx = MMC_CMD_APP_CMD;
-                       cmd.resp_type = MMC_RSP_R1;
-                       cmd.cmdarg = mmc->rca << 16;
-
-                       err = mmc_send_cmd(mmc, &cmd, NULL);
-                       if (err)
-                               return err;
-
-                       cmd.cmdidx = SD_CMD_APP_SET_BUS_WIDTH;
-                       cmd.resp_type = MMC_RSP_R1;
-                       cmd.cmdarg = 2;
-                       err = mmc_send_cmd(mmc, &cmd, NULL);
-                       if (err)
-                               return err;
-
-                       mmc_set_bus_width(mmc, 4);
-               }
-
-               if (mmc->card_caps & MMC_MODE_HS)
-                       mmc->tran_speed = 50000000;
-               else
-                       mmc->tran_speed = 25000000;
+               err = sd_get_capabilities(mmc);
+               if (err)
+                       return err;
+               err = sd_select_mode_and_width(mmc, mmc->card_caps);
        } else {
-               int idx;
-
-               /* An array of possible bus widths in order of preference */
-               static unsigned ext_csd_bits[] = {
-                       EXT_CSD_DDR_BUS_WIDTH_8,
-                       EXT_CSD_DDR_BUS_WIDTH_4,
-                       EXT_CSD_BUS_WIDTH_8,
-                       EXT_CSD_BUS_WIDTH_4,
-                       EXT_CSD_BUS_WIDTH_1,
-               };
-
-               /* An array to map CSD bus widths to host cap bits */
-               static unsigned ext_to_hostcaps[] = {
-                       [EXT_CSD_DDR_BUS_WIDTH_4] =
-                               MMC_MODE_DDR_52MHz | MMC_MODE_4BIT,
-                       [EXT_CSD_DDR_BUS_WIDTH_8] =
-                               MMC_MODE_DDR_52MHz | MMC_MODE_8BIT,
-                       [EXT_CSD_BUS_WIDTH_4] = MMC_MODE_4BIT,
-                       [EXT_CSD_BUS_WIDTH_8] = MMC_MODE_8BIT,
-               };
-
-               /* An array to map chosen bus width to an integer */
-               static unsigned widths[] = {
-                       8, 4, 8, 4, 1,
-               };
-
-               for (idx=0; idx < ARRAY_SIZE(ext_csd_bits); idx++) {
-                       unsigned int extw = ext_csd_bits[idx];
-                       unsigned int caps = ext_to_hostcaps[extw];
-
-                       /*
-                        * Check to make sure the card and controller support
-                        * these capabilities
-                        */
-                       if ((mmc->card_caps & caps) != caps)
-                               continue;
-
-                       err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
-                                       EXT_CSD_BUS_WIDTH, extw);
-
-                       if (err)
-                               continue;
-
-                       mmc->ddr_mode = (caps & MMC_MODE_DDR_52MHz) ? 1 : 0;
-                       mmc_set_bus_width(mmc, widths[idx]);
-
-                       err = mmc_send_ext_csd(mmc, test_csd);
-
-                       if (err)
-                               continue;
-
-                       /* Only compare read only fields */
-                       if (ext_csd[EXT_CSD_PARTITIONING_SUPPORT]
-                               == test_csd[EXT_CSD_PARTITIONING_SUPPORT] &&
-                           ext_csd[EXT_CSD_HC_WP_GRP_SIZE]
-                               == test_csd[EXT_CSD_HC_WP_GRP_SIZE] &&
-                           ext_csd[EXT_CSD_REV]
-                               == test_csd[EXT_CSD_REV] &&
-                           ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE]
-                               == test_csd[EXT_CSD_HC_ERASE_GRP_SIZE] &&
-                           memcmp(&ext_csd[EXT_CSD_SEC_CNT],
-                                  &test_csd[EXT_CSD_SEC_CNT], 4) == 0)
-                               break;
-                       else
-                               err = SWITCH_ERR;
-               }
-
+               err = mmc_get_capabilities(mmc);
                if (err)
                        return err;
-
-               if (mmc->card_caps & MMC_MODE_HS) {
-                       if (mmc->card_caps & MMC_MODE_HS_52MHz)
-                               mmc->tran_speed = 52000000;
-                       else
-                               mmc->tran_speed = 26000000;
-               }
+               mmc_select_mode_and_width(mmc, mmc->card_caps);
        }
 
-       mmc_set_clock(mmc, mmc->tran_speed);
+       if (err)
+               return err;
+
+       mmc->best_mode = mmc->selected_mode;
+
+       /* Fix the block length for DDR mode */
+       if (mmc->ddr_mode) {
+               mmc->read_bl_len = MMC_MAX_BLOCK_LEN;
+               mmc->write_bl_len = MMC_MAX_BLOCK_LEN;
+       }
 
        /* fill in device description */
-       mmc->block_dev.lun = 0;
-       mmc->block_dev.type = 0;
-       mmc->block_dev.blksz = mmc->read_bl_len;
-       mmc->block_dev.log2blksz = LOG2(mmc->block_dev.blksz);
-       mmc->block_dev.lba = lldiv(mmc->capacity, mmc->read_bl_len);
-#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
-       sprintf(mmc->block_dev.vendor, "Man %06x Snr %04x%04x",
+       bdesc = mmc_get_blk_desc(mmc);
+       bdesc->lun = 0;
+       bdesc->hwpart = 0;
+       bdesc->type = 0;
+       bdesc->blksz = mmc->read_bl_len;
+       bdesc->log2blksz = LOG2(bdesc->blksz);
+       bdesc->lba = lldiv(mmc->capacity, mmc->read_bl_len);
+#if !defined(CONFIG_SPL_BUILD) || \
+               (defined(CONFIG_SPL_LIBCOMMON_SUPPORT) && \
+               !defined(CONFIG_USE_TINY_PRINTF))
+       sprintf(bdesc->vendor, "Man %06x Snr %04x%04x",
                mmc->cid[0] >> 24, (mmc->cid[2] & 0xffff),
                (mmc->cid[3] >> 16) & 0xffff);
-       sprintf(mmc->block_dev.product, "%c%c%c%c%c%c", mmc->cid[0] & 0xff,
+       sprintf(bdesc->product, "%c%c%c%c%c%c", mmc->cid[0] & 0xff,
                (mmc->cid[1] >> 24), (mmc->cid[1] >> 16) & 0xff,
                (mmc->cid[1] >> 8) & 0xff, mmc->cid[1] & 0xff,
                (mmc->cid[2] >> 24) & 0xff);
-       sprintf(mmc->block_dev.revision, "%d.%d", (mmc->cid[2] >> 20) & 0xf,
+       sprintf(bdesc->revision, "%d.%d", (mmc->cid[2] >> 20) & 0xf,
                (mmc->cid[2] >> 16) & 0xf);
 #else
-       mmc->block_dev.vendor[0] = 0;
-       mmc->block_dev.product[0] = 0;
-       mmc->block_dev.revision[0] = 0;
+       bdesc->vendor[0] = 0;
+       bdesc->product[0] = 0;
+       bdesc->revision[0] = 0;
 #endif
 #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBDISK_SUPPORT)
-       init_part(&mmc->block_dev);
+       part_init(bdesc);
 #endif
 
        return 0;
@@ -1232,110 +2199,177 @@ static int mmc_send_if_cond(struct mmc *mmc)
                return err;
 
        if ((cmd.response[0] & 0xff) != 0xaa)
-               return UNUSABLE_ERR;
+               return -EOPNOTSUPP;
        else
                mmc->version = SD_VERSION_2;
 
        return 0;
 }
 
-/* not used any more */
-int __deprecated mmc_register(struct mmc *mmc)
+#if !CONFIG_IS_ENABLED(DM_MMC)
+/* board-specific MMC power initializations. */
+__weak void board_mmc_power_init(void)
 {
-#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
-       printf("%s is deprecated! use mmc_create() instead.\n", __func__);
-#endif
-       return -1;
 }
+#endif
 
-struct mmc *mmc_create(const struct mmc_config *cfg, void *priv)
+static int mmc_power_init(struct mmc *mmc)
 {
-       struct mmc *mmc;
-
-       /* quick validation */
-       if (cfg == NULL || cfg->ops == NULL || cfg->ops->send_cmd == NULL ||
-                       cfg->f_min == 0 || cfg->f_max == 0 || cfg->b_max == 0)
-               return NULL;
-
-       mmc = calloc(1, sizeof(*mmc));
-       if (mmc == NULL)
-               return NULL;
-
-       mmc->cfg = cfg;
-       mmc->priv = priv;
-
-       /* the following chunk was mmc_register() */
+#if CONFIG_IS_ENABLED(DM_MMC)
+#if CONFIG_IS_ENABLED(DM_REGULATOR)
+       int ret;
 
-       /* Setup dsr related values */
-       mmc->dsr_imp = 0;
-       mmc->dsr = 0xffffffff;
-       /* Setup the universal parts of the block interface just once */
-       mmc->block_dev.if_type = IF_TYPE_MMC;
-       mmc->block_dev.dev = cur_dev_num++;
-       mmc->block_dev.removable = 1;
-       mmc->block_dev.block_read = mmc_bread;
-       mmc->block_dev.block_write = mmc_bwrite;
-       mmc->block_dev.block_erase = mmc_berase;
+       ret = device_get_supply_regulator(mmc->dev, "vmmc-supply",
+                                         &mmc->vmmc_supply);
+       if (ret)
+               debug("%s: No vmmc supply\n", mmc->dev->name);
 
-       /* setup initial part type */
-       mmc->block_dev.part_type = mmc->cfg->part_type;
+       ret = device_get_supply_regulator(mmc->dev, "vqmmc-supply",
+                                         &mmc->vqmmc_supply);
+       if (ret)
+               debug("%s: No vqmmc supply\n", mmc->dev->name);
+#endif
+#else /* !CONFIG_DM_MMC */
+       /*
+        * Driver model should use a regulator, as above, rather than calling
+        * out to board code.
+        */
+       board_mmc_power_init();
+#endif
+       return 0;
+}
 
-       INIT_LIST_HEAD(&mmc->link);
+/*
+ * put the host in the initial state:
+ * - turn on Vdd (card power supply)
+ * - configure the bus width and clock to minimal values
+ */
+static void mmc_set_initial_state(struct mmc *mmc)
+{
+       int err;
 
-       list_add_tail(&mmc->link, &mmc_devices);
+       /* First try to set 3.3V. If it fails set to 1.8V */
+       err = mmc_set_signal_voltage(mmc, MMC_SIGNAL_VOLTAGE_330);
+       if (err != 0)
+               err = mmc_set_signal_voltage(mmc, MMC_SIGNAL_VOLTAGE_180);
+       if (err != 0)
+               printf("mmc: failed to set signal voltage\n");
 
-       return mmc;
+       mmc_select_mode(mmc, MMC_LEGACY);
+       mmc_set_bus_width(mmc, 1);
+       mmc_set_clock(mmc, 0, false);
 }
 
-void mmc_destroy(struct mmc *mmc)
+static int mmc_power_on(struct mmc *mmc)
 {
-       /* only freeing memory for now */
-       free(mmc);
+#if CONFIG_IS_ENABLED(DM_MMC) && CONFIG_IS_ENABLED(DM_REGULATOR)
+       if (mmc->vmmc_supply) {
+               int ret = regulator_set_enable(mmc->vmmc_supply, true);
+
+               if (ret) {
+                       puts("Error enabling VMMC supply\n");
+                       return ret;
+               }
+       }
+#endif
+       return 0;
 }
 
-#ifdef CONFIG_PARTITIONS
-block_dev_desc_t *mmc_get_dev(int dev)
+static int mmc_power_off(struct mmc *mmc)
 {
-       struct mmc *mmc = find_mmc_device(dev);
-       if (!mmc || mmc_init(mmc))
-               return NULL;
-
-       return &mmc->block_dev;
-}
+       mmc_set_clock(mmc, 1, true);
+#if CONFIG_IS_ENABLED(DM_MMC) && CONFIG_IS_ENABLED(DM_REGULATOR)
+       if (mmc->vmmc_supply) {
+               int ret = regulator_set_enable(mmc->vmmc_supply, false);
+
+               if (ret) {
+                       debug("Error disabling VMMC supply\n");
+                       return ret;
+               }
+       }
 #endif
+       return 0;
+}
 
-/* board-specific MMC power initializations. */
-__weak void board_mmc_power_init(void)
+static int mmc_power_cycle(struct mmc *mmc)
 {
+       int ret;
+
+       ret = mmc_power_off(mmc);
+       if (ret)
+               return ret;
+       /*
+        * SD spec recommends at least 1ms of delay. Let's wait for 2ms
+        * to be on the safer side.
+        */
+       udelay(2000);
+       return mmc_power_on(mmc);
 }
 
 int mmc_start_init(struct mmc *mmc)
 {
+       bool no_card;
+       bool uhs_en = supports_uhs(mmc->cfg->host_caps);
        int err;
 
+       mmc->host_caps = mmc->cfg->host_caps;
+
        /* we pretend there's no card when init is NULL */
-       if (mmc_getcd(mmc) == 0 || mmc->cfg->ops->init == NULL) {
+       no_card = mmc_getcd(mmc) == 0;
+#if !CONFIG_IS_ENABLED(DM_MMC)
+       no_card = no_card || (mmc->cfg->ops->init == NULL);
+#endif
+       if (no_card) {
                mmc->has_init = 0;
 #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
                printf("MMC: no card present\n");
 #endif
-               return NO_CARD_ERR;
+               return -ENOMEDIUM;
        }
 
        if (mmc->has_init)
                return 0;
 
-       board_mmc_power_init();
+#ifdef CONFIG_FSL_ESDHC_ADAPTER_IDENT
+       mmc_adapter_card_type_ident();
+#endif
+       err = mmc_power_init(mmc);
+       if (err)
+               return err;
 
-       /* made sure it's not NULL earlier */
-       err = mmc->cfg->ops->init(mmc);
+#ifdef CONFIG_MMC_QUIRKS
+       mmc->quirks = MMC_QUIRK_RETRY_SET_BLOCKLEN |
+                     MMC_QUIRK_RETRY_SEND_CID;
+#endif
 
+       err = mmc_power_cycle(mmc);
+       if (err) {
+               /*
+                * if power cycling is not supported, we should not try
+                * to use the UHS modes, because we wouldn't be able to
+                * recover from an error during the UHS initialization.
+                */
+               debug("Unable to do a full power cycle. Disabling the UHS modes for safety\n");
+               uhs_en = false;
+               mmc->host_caps &= ~UHS_CAPS;
+               err = mmc_power_on(mmc);
+       }
        if (err)
                return err;
 
+#if CONFIG_IS_ENABLED(DM_MMC)
+       /* The device has already been probed ready for use */
+#else
+       /* made sure it's not NULL earlier */
+       err = mmc->cfg->ops->init(mmc);
+       if (err)
+               return err;
+#endif
        mmc->ddr_mode = 0;
-       mmc_set_bus_width(mmc, 1);
-       mmc_set_clock(mmc, 1);
+
+retry:
+       mmc_set_initial_state(mmc);
+       mmc_send_init_stream(mmc);
 
        /* Reset the Card */
        err = mmc_go_idle(mmc);
@@ -1344,27 +2378,32 @@ int mmc_start_init(struct mmc *mmc)
                return err;
 
        /* The internal partition reset to user partition(0) at every CMD0*/
-       mmc->part_num = 0;
+       mmc_get_blk_desc(mmc)->hwpart = 0;
 
        /* Test for SD version 2 */
        err = mmc_send_if_cond(mmc);
 
        /* Now try to get the SD card's operating condition */
-       err = sd_send_op_cond(mmc);
+       err = sd_send_op_cond(mmc, uhs_en);
+       if (err && uhs_en) {
+               uhs_en = false;
+               mmc_power_cycle(mmc);
+               goto retry;
+       }
 
        /* If the command timed out, we check for an MMC card */
-       if (err == TIMEOUT) {
+       if (err == -ETIMEDOUT) {
                err = mmc_send_op_cond(mmc);
 
-               if (err && err != IN_PROGRESS) {
+               if (err) {
 #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
                        printf("Card did not respond to voltage select!\n");
 #endif
-                       return UNUSABLE_ERR;
+                       return -EOPNOTSUPP;
                }
        }
 
-       if (err == IN_PROGRESS)
+       if (!err)
                mmc->init_in_progress = 1;
 
        return err;
@@ -1374,6 +2413,7 @@ static int mmc_complete_init(struct mmc *mmc)
 {
        int err = 0;
 
+       mmc->init_in_progress = 0;
        if (mmc->op_cond_pending)
                err = mmc_complete_op_cond(mmc);
 
@@ -1383,15 +2423,18 @@ static int mmc_complete_init(struct mmc *mmc)
                mmc->has_init = 0;
        else
                mmc->has_init = 1;
-       mmc->init_in_progress = 0;
        return err;
 }
 
 int mmc_init(struct mmc *mmc)
 {
-       int err = IN_PROGRESS;
-       unsigned start;
+       int err = 0;
+       __maybe_unused unsigned start;
+#if CONFIG_IS_ENABLED(DM_MMC)
+       struct mmc_uclass_priv *upriv = dev_get_uclass_priv(mmc->dev);
 
+       upriv->mmc = mmc;
+#endif
        if (mmc->has_init)
                return 0;
 
@@ -1400,9 +2443,11 @@ int mmc_init(struct mmc *mmc)
        if (!mmc->init_in_progress)
                err = mmc_start_init(mmc);
 
-       if (!err || err == IN_PROGRESS)
+       if (!err)
                err = mmc_complete_init(mmc);
-       debug("%s: %d, time %lu\n", __func__, err, get_timer(start));
+       if (err)
+               printf("%s: %d, time %lu\n", __func__, err, get_timer(start));
+
        return err;
 }
 
@@ -1424,191 +2469,110 @@ __weak int board_mmc_init(bd_t *bis)
        return -1;
 }
 
-#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
-
-void print_mmc_devices(char separator)
-{
-       struct mmc *m;
-       struct list_head *entry;
-
-       list_for_each(entry, &mmc_devices) {
-               m = list_entry(entry, struct mmc, link);
-
-               printf("%s: %d", m->cfg->name, m->block_dev.dev);
-
-               if (entry->next != &mmc_devices) {
-                       printf("%c", separator);
-                       if (separator != '\n')
-                               puts (" ");
-               }
-       }
-
-       printf("\n");
-}
-
-#else
-void print_mmc_devices(char separator) { }
-#endif
-
-int get_mmc_num(void)
-{
-       return cur_dev_num;
-}
-
 void mmc_set_preinit(struct mmc *mmc, int preinit)
 {
        mmc->preinit = preinit;
 }
 
-static void do_preinit(void)
+#if CONFIG_IS_ENABLED(DM_MMC) && defined(CONFIG_SPL_BUILD)
+static int mmc_probe(bd_t *bis)
+{
+       return 0;
+}
+#elif CONFIG_IS_ENABLED(DM_MMC)
+static int mmc_probe(bd_t *bis)
 {
-       struct mmc *m;
-       struct list_head *entry;
+       int ret, i;
+       struct uclass *uc;
+       struct udevice *dev;
 
-       list_for_each(entry, &mmc_devices) {
-               m = list_entry(entry, struct mmc, link);
+       ret = uclass_get(UCLASS_MMC, &uc);
+       if (ret)
+               return ret;
 
-               if (m->preinit)
-                       mmc_start_init(m);
+       /*
+        * Try to add them in sequence order. Really with driver model we
+        * should allow holes, but the current MMC list does not allow that.
+        * So if we request 0, 1, 3 we will get 0, 1, 2.
+        */
+       for (i = 0; ; i++) {
+               ret = uclass_get_device_by_seq(UCLASS_MMC, i, &dev);
+               if (ret == -ENODEV)
+                       break;
+       }
+       uclass_foreach_dev(dev, uc) {
+               ret = device_probe(dev);
+               if (ret)
+                       printf("%s - probe failed: %d\n", dev->name, ret);
        }
+
+       return 0;
 }
+#else
+static int mmc_probe(bd_t *bis)
+{
+       if (board_mmc_init(bis) < 0)
+               cpu_mmc_init(bis);
 
+       return 0;
+}
+#endif
 
 int mmc_initialize(bd_t *bis)
 {
-       INIT_LIST_HEAD (&mmc_devices);
-       cur_dev_num = 0;
+       static int initialized = 0;
+       int ret;
+       if (initialized)        /* Avoid initializing mmc multiple times */
+               return 0;
+       initialized = 1;
 
-       if (board_mmc_init(bis) < 0)
-               cpu_mmc_init(bis);
+#if !CONFIG_IS_ENABLED(BLK)
+#if !CONFIG_IS_ENABLED(MMC_TINY)
+       mmc_list_init();
+#endif
+#endif
+       ret = mmc_probe(bis);
+       if (ret)
+               return ret;
 
 #ifndef CONFIG_SPL_BUILD
        print_mmc_devices(',');
 #endif
 
-       do_preinit();
+       mmc_do_preinit();
        return 0;
 }
 
-#ifdef CONFIG_SUPPORT_EMMC_BOOT
-/*
- * This function changes the size of boot partition and the size of rpmb
- * partition present on EMMC devices.
- *
- * Input Parameters:
- * struct *mmc: pointer for the mmc device strcuture
- * bootsize: size of boot partition
- * rpmbsize: size of rpmb partition
- *
- * Returns 0 on success.
- */
-
-int mmc_boot_partition_size_change(struct mmc *mmc, unsigned long bootsize,
-                               unsigned long rpmbsize)
+#ifdef CONFIG_CMD_BKOPS_ENABLE
+int mmc_set_bkops_enable(struct mmc *mmc)
 {
        int err;
-       struct mmc_cmd cmd;
-
-       /* Only use this command for raw EMMC moviNAND. Enter backdoor mode */
-       cmd.cmdidx = MMC_CMD_RES_MAN;
-       cmd.resp_type = MMC_RSP_R1b;
-       cmd.cmdarg = MMC_CMD62_ARG1;
+       ALLOC_CACHE_ALIGN_BUFFER(u8, ext_csd, MMC_MAX_BLOCK_LEN);
 
-       err = mmc_send_cmd(mmc, &cmd, NULL);
+       err = mmc_send_ext_csd(mmc, ext_csd);
        if (err) {
-               debug("mmc_boot_partition_size_change: Error1 = %d\n", err);
+               puts("Could not get ext_csd register values\n");
                return err;
        }
 
-       /* Boot partition changing mode */
-       cmd.cmdidx = MMC_CMD_RES_MAN;
-       cmd.resp_type = MMC_RSP_R1b;
-       cmd.cmdarg = MMC_CMD62_ARG2;
-
-       err = mmc_send_cmd(mmc, &cmd, NULL);
-       if (err) {
-               debug("mmc_boot_partition_size_change: Error2 = %d\n", err);
-               return err;
+       if (!(ext_csd[EXT_CSD_BKOPS_SUPPORT] & 0x1)) {
+               puts("Background operations not supported on device\n");
+               return -EMEDIUMTYPE;
        }
-       /* boot partition size is multiple of 128KB */
-       bootsize = (bootsize * 1024) / 128;
 
-       /* Arg: boot partition size */
-       cmd.cmdidx = MMC_CMD_RES_MAN;
-       cmd.resp_type = MMC_RSP_R1b;
-       cmd.cmdarg = bootsize;
-
-       err = mmc_send_cmd(mmc, &cmd, NULL);
-       if (err) {
-               debug("mmc_boot_partition_size_change: Error3 = %d\n", err);
-               return err;
+       if (ext_csd[EXT_CSD_BKOPS_EN] & 0x1) {
+               puts("Background operations already enabled\n");
+               return 0;
        }
-       /* RPMB partition size is multiple of 128KB */
-       rpmbsize = (rpmbsize * 1024) / 128;
-       /* Arg: RPMB partition size */
-       cmd.cmdidx = MMC_CMD_RES_MAN;
-       cmd.resp_type = MMC_RSP_R1b;
-       cmd.cmdarg = rpmbsize;
 
-       err = mmc_send_cmd(mmc, &cmd, NULL);
+       err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BKOPS_EN, 1);
        if (err) {
-               debug("mmc_boot_partition_size_change: Error4 = %d\n", err);
+               puts("Failed to enable manual background operations\n");
                return err;
        }
-       return 0;
-}
-
-/*
- * Modify EXT_CSD[177] which is BOOT_BUS_WIDTH
- * based on the passed in values for BOOT_BUS_WIDTH, RESET_BOOT_BUS_WIDTH
- * and BOOT_MODE.
- *
- * Returns 0 on success.
- */
-int mmc_set_boot_bus_width(struct mmc *mmc, u8 width, u8 reset, u8 mode)
-{
-       int err;
-
-       err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BOOT_BUS_WIDTH,
-                        EXT_CSD_BOOT_BUS_WIDTH_MODE(mode) |
-                        EXT_CSD_BOOT_BUS_WIDTH_RESET(reset) |
-                        EXT_CSD_BOOT_BUS_WIDTH_WIDTH(width));
-
-       if (err)
-               return err;
-       return 0;
-}
-
-/*
- * Modify EXT_CSD[179] which is PARTITION_CONFIG (formerly BOOT_CONFIG)
- * based on the passed in values for BOOT_ACK, BOOT_PARTITION_ENABLE and
- * PARTITION_ACCESS.
- *
- * Returns 0 on success.
- */
-int mmc_set_part_conf(struct mmc *mmc, u8 ack, u8 part_num, u8 access)
-{
-       int err;
 
-       err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_PART_CONF,
-                        EXT_CSD_BOOT_ACK(ack) |
-                        EXT_CSD_BOOT_PART_NUM(part_num) |
-                        EXT_CSD_PARTITION_ACCESS(access));
+       puts("Enabled manual background operations\n");
 
-       if (err)
-               return err;
        return 0;
 }
-
-/*
- * Modify EXT_CSD[162] which is RST_n_FUNCTION based on the given value
- * for enable.  Note that this is a write-once field for non-zero values.
- *
- * Returns 0 on success.
- */
-int mmc_set_rst_n_function(struct mmc *mmc, u8 enable)
-{
-       return mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_RST_N_FUNCTION,
-                         enable);
-}
 #endif