mmc: sdhci: Add support for eMMC HS200 mode

Add support for eMMC HS200 mode by reading
card type from ext_csd and then by switching to
HS200 timing mode.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index d4ea0c293dbf12a29477144128e4dc32769b68f3..7e18a38165b28b870ce015b16eddb422c081fe7f 100644 (file)
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -619,9 +619,16 @@ static int mmc_change_freq(struct mmc *mmc)
        if (err)
                return err;
 
-       cardtype = ext_csd[EXT_CSD_CARD_TYPE] & 0xf;
+       cardtype = ext_csd[EXT_CSD_CARD_TYPE] & 0x3f;
 
-       err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_HS_TIMING, 1);
+       if (cardtype & EXT_CSD_CARD_TYPE_HS200)
+               err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
+                                EXT_CSD_HS_TIMING,
+                                EXT_CSD_HS_TIMING_HS200);
+       else
+               err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
+                                EXT_CSD_HS_TIMING,
+                                EXT_CSD_HS_TIMING_HIGH_SPEED);
 
        if (err)
                return err;
@@ -636,8 +643,10 @@ static int mmc_change_freq(struct mmc *mmc)
        if (!ext_csd[EXT_CSD_HS_TIMING])
                return 0;
 
-       /* High Speed is set, there are two types: 52MHz and 26MHz */
-       if (cardtype & EXT_CSD_CARD_TYPE_52) {
+       /* High Speed is set, there are three types: 200MHZ, 52MHz and 26MHz */
+       if (cardtype & EXT_CSD_CARD_TYPE_HS200) {
+               mmc->card_caps |= MMC_MODE_HS200;
+       } else if (cardtype & EXT_CSD_CARD_TYPE_52) {
                if (cardtype & EXT_CSD_CARD_TYPE_DDR_1_8V)
                        mmc->card_caps |= MMC_MODE_DDR_52MHz;
                mmc->card_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS;
@@ -1659,7 +1668,9 @@ static int mmc_startup(struct mmc *mmc)
                if (err)
                        return err;
 
-               if (mmc->card_caps & MMC_MODE_HS) {
+               if (mmc->card_caps & MMC_MODE_HS200) {
+                       mmc->tran_speed = 200000000;
+               } else if (mmc->card_caps & MMC_MODE_HS) {
                        if (mmc->card_caps & MMC_MODE_HS_52MHz)
                                mmc->tran_speed = 52000000;
                        else
@@ -1670,7 +1681,8 @@ static int mmc_startup(struct mmc *mmc)
        mmc_set_clock(mmc, mmc->tran_speed);
 
        if ((mmc->card_caps & (MMC_MODE_UHS_SDR50 |
-                              MMC_MODE_UHS_SDR104)) &&
+                              MMC_MODE_UHS_SDR104 |
+                              MMC_MODE_HS200)) &&
            (mmc->cfg->host_caps & MMC_MODE_NEEDS_TUNING)) {
                err = mmc_execute_tuning(mmc);
                if (err)

diff --git a/include/mmc.h b/include/mmc.h
index 9a0a4729ac4c171ad49222c8c94a16398469a677..ce8cb55e5796dc20935e0ba5ed7d069286936189 100644 (file)
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -223,6 +223,13 @@
 #define EXT_CSD_CARD_TYPE_DDR_1_2V     (1 << 3)
 #define EXT_CSD_CARD_TYPE_DDR_52       (EXT_CSD_CARD_TYPE_DDR_1_8V \
                                        | EXT_CSD_CARD_TYPE_DDR_1_2V)
+#define EXT_CSD_CARD_TYPE_HS200_1_8V   (1 << 4)
+#define EXT_CSD_CARD_TYPE_HS200_1_2V   (1 << 5)
+#define EXT_CSD_CARD_TYPE_HS200                (EXT_CSD_CARD_TYPE_HS200_1_8V \
+                                       | EXT_CSD_CARD_TYPE_HS200_1_2V)
+
+#define EXT_CSD_HS_TIMING_HIGH_SPEED   1
+#define EXT_CSD_HS_TIMING_HS200                2
 
 #define EXT_CSD_BUS_WIDTH_1    0       /* Card is in 1 bit mode */
 #define EXT_CSD_BUS_WIDTH_4    1       /* Card is in 4 bit mode */