mmc: sd: Macro name cleanup for high speed dtr

Add new macros for the high speed 50MHz case, rather than having
a confusing reuse of the value for UHS SDR50, which is 100MHz.

Reported-by: Aaron Lu <aaron.lu@amd.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Qiang Liu 2011-11-08 08:43:08 -05:00 committed by Chris Ball
parent 8d362b0dea
commit fffe5d5aa0
2 changed files with 5 additions and 2 deletions

View File

@ -307,8 +307,8 @@ static int mmc_read_switch(struct mmc_card *card)
goto out; goto out;
} }
if (status[13] & UHS_SDR50_BUS_SPEED) if (status[13] & SD_MODE_HIGH_SPEED)
card->sw_caps.hs_max_dtr = 50000000; card->sw_caps.hs_max_dtr = HIGH_SPEED_MAX_DTR;
if (card->scr.sda_spec3) { if (card->scr.sda_spec3) {
card->sw_caps.sd3_bus_mode = status[13]; card->sw_caps.sd3_bus_mode = status[13];

View File

@ -110,6 +110,7 @@ struct sd_ssr {
struct sd_switch_caps { struct sd_switch_caps {
unsigned int hs_max_dtr; unsigned int hs_max_dtr;
unsigned int uhs_max_dtr; unsigned int uhs_max_dtr;
#define HIGH_SPEED_MAX_DTR 50000000
#define UHS_SDR104_MAX_DTR 208000000 #define UHS_SDR104_MAX_DTR 208000000
#define UHS_SDR50_MAX_DTR 100000000 #define UHS_SDR50_MAX_DTR 100000000
#define UHS_DDR50_MAX_DTR 50000000 #define UHS_DDR50_MAX_DTR 50000000
@ -117,11 +118,13 @@ struct sd_switch_caps {
#define UHS_SDR12_MAX_DTR 25000000 #define UHS_SDR12_MAX_DTR 25000000
unsigned int sd3_bus_mode; unsigned int sd3_bus_mode;
#define UHS_SDR12_BUS_SPEED 0 #define UHS_SDR12_BUS_SPEED 0
#define HIGH_SPEED_BUS_SPEED 1
#define UHS_SDR25_BUS_SPEED 1 #define UHS_SDR25_BUS_SPEED 1
#define UHS_SDR50_BUS_SPEED 2 #define UHS_SDR50_BUS_SPEED 2
#define UHS_SDR104_BUS_SPEED 3 #define UHS_SDR104_BUS_SPEED 3
#define UHS_DDR50_BUS_SPEED 4 #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_SDR12 (1 << UHS_SDR12_BUS_SPEED)
#define SD_MODE_UHS_SDR25 (1 << UHS_SDR25_BUS_SPEED) #define SD_MODE_UHS_SDR25 (1 << UHS_SDR25_BUS_SPEED)
#define SD_MODE_UHS_SDR50 (1 << UHS_SDR50_BUS_SPEED) #define SD_MODE_UHS_SDR50 (1 << UHS_SDR50_BUS_SPEED)