|
@@ -132,7 +132,6 @@ 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)",
|
|
@@ -158,7 +157,6 @@ static uint mmc_mode2freq(struct mmc *mmc, enum bus_mode mode)
|
|
|
{
|
|
|
static const int freqs[] = {
|
|
|
[MMC_LEGACY] = 25000000,
|
|
|
- [SD_LEGACY] = 25000000,
|
|
|
[MMC_HS] = 26000000,
|
|
|
[SD_HS] = 50000000,
|
|
|
[MMC_HS_52] = 52000000,
|
|
@@ -1239,7 +1237,7 @@ static int sd_get_capabilities(struct mmc *mmc)
|
|
|
u32 sd3_bus_mode;
|
|
|
#endif
|
|
|
|
|
|
- mmc->card_caps = MMC_MODE_1BIT | MMC_CAP(SD_LEGACY);
|
|
|
+ mmc->card_caps = MMC_MODE_1BIT | MMC_CAP(MMC_LEGACY);
|
|
|
|
|
|
if (mmc_host_is_spi(mmc))
|
|
|
return 0;
|
|
@@ -1352,7 +1350,7 @@ static int sd_set_card_speed(struct mmc *mmc, enum bus_mode mode)
|
|
|
return 0;
|
|
|
|
|
|
switch (mode) {
|
|
|
- case SD_LEGACY:
|
|
|
+ case MMC_LEGACY:
|
|
|
speed = UHS_SDR12_BUS_SPEED;
|
|
|
break;
|
|
|
case SD_HS:
|
|
@@ -1695,7 +1693,7 @@ static const struct mode_width_tuning sd_modes_by_pref[] = {
|
|
|
},
|
|
|
#endif
|
|
|
{
|
|
|
- .mode = SD_LEGACY,
|
|
|
+ .mode = MMC_LEGACY,
|
|
|
.widths = MMC_MODE_4BIT | MMC_MODE_1BIT,
|
|
|
}
|
|
|
};
|
|
@@ -1725,7 +1723,7 @@ static int sd_select_mode_and_width(struct mmc *mmc, uint card_caps)
|
|
|
|
|
|
if (mmc_host_is_spi(mmc)) {
|
|
|
mmc_set_bus_width(mmc, 1);
|
|
|
- mmc_select_mode(mmc, SD_LEGACY);
|
|
|
+ mmc_select_mode(mmc, MMC_LEGACY);
|
|
|
mmc_set_clock(mmc, mmc->tran_speed, MMC_CLK_ENABLE);
|
|
|
return 0;
|
|
|
}
|
|
@@ -1784,7 +1782,7 @@ static int sd_select_mode_and_width(struct mmc *mmc, uint card_caps)
|
|
|
|
|
|
error:
|
|
|
/* revert to a safer bus speed */
|
|
|
- mmc_select_mode(mmc, SD_LEGACY);
|
|
|
+ mmc_select_mode(mmc, MMC_LEGACY);
|
|
|
mmc_set_clock(mmc, mmc->tran_speed,
|
|
|
MMC_CLK_ENABLE);
|
|
|
}
|
|
@@ -2561,7 +2559,7 @@ static int mmc_startup(struct mmc *mmc)
|
|
|
|
|
|
#if CONFIG_IS_ENABLED(MMC_TINY)
|
|
|
mmc_set_clock(mmc, mmc->legacy_speed, false);
|
|
|
- mmc_select_mode(mmc, IS_SD(mmc) ? SD_LEGACY : MMC_LEGACY);
|
|
|
+ mmc_select_mode(mmc, MMC_LEGACY);
|
|
|
mmc_set_bus_width(mmc, 1);
|
|
|
#else
|
|
|
if (IS_SD(mmc)) {
|
|
@@ -2843,7 +2841,7 @@ int mmc_start_init(struct mmc *mmc)
|
|
|
* all hosts are capable of 1 bit bus-width and able to use the legacy
|
|
|
* timings.
|
|
|
*/
|
|
|
- mmc->host_caps = mmc->cfg->host_caps | MMC_CAP(SD_LEGACY) |
|
|
|
+ mmc->host_caps = mmc->cfg->host_caps | MMC_CAP(MMC_LEGACY) |
|
|
|
MMC_CAP(MMC_LEGACY) | MMC_MODE_1BIT;
|
|
|
#if CONFIG_IS_ENABLED(DM_MMC)
|
|
|
mmc_deferred_probe(mmc);
|