2 files changed, 5 insertions, 2 deletions

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index f2a05ea40f2a..f54392c4638a 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -307,8 +307,8 @@ static int mmc_read_switch(struct mmc_card *card)
                 goto out;
         }
 
-        if (status[13] & UHS_SDR50_BUS_SPEED)
-                card->sw_caps.hs_max_dtr = 50000000;
+        if (status[13] & SD_MODE_HIGH_SPEED)
+                card->sw_caps.hs_max_dtr = HIGH_SPEED_MAX_DTR;
 
         if (card->scr.sda_spec3) {
                 card->sw_caps.sd3_bus_mode = status[13];
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index c8ef9bc54d50..2c9be29684cf 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -110,6 +110,7 @@ struct sd_ssr {
 struct sd_switch_caps {
         unsigned int            hs_max_dtr;
         unsigned int            uhs_max_dtr;
+#define HIGH_SPEED_MAX_DTR      50000000
 #define UHS_SDR104_MAX_DTR      208000000
 #define UHS_SDR50_MAX_DTR       100000000
 #define UHS_DDR50_MAX_DTR       50000000
@@ -117,11 +118,13 @@ struct sd_switch_caps {
 #define UHS_SDR12_MAX_DTR       25000000
         unsigned int            sd3_bus_mode;
 #define UHS_SDR12_BUS_SPEED     0
+#define HIGH_SPEED_BUS_SPEED    1
 #define UHS_SDR25_BUS_SPEED     1
 #define UHS_SDR50_BUS_SPEED     2
 #define UHS_SDR104_BUS_SPEED    3
 #define UHS_DDR50_BUS_SPEED     4
 
+#define SD_MODE_HIGH_SPEED      (1 << HIGH_SPEED_BUS_SPEED)
 #define SD_MODE_UHS_SDR12       (1 << UHS_SDR12_BUS_SPEED)
 #define SD_MODE_UHS_SDR25       (1 << UHS_SDR25_BUS_SPEED)
 #define SD_MODE_UHS_SDR50       (1 << UHS_SDR50_BUS_SPEED)