Commit e8d5dde4473514327b5ea67fb69d8fdd8410240c
Committed by
Peng Fan
Peng Fan
1 parent
cb884347f4
Exists in
smarc_8mq_lf_v2020.04
and in
9 other branches
mmc: Merge SD_LEGACY and MMC_LEGACY bus modes
MMC_LEGACY & SD_LEGACY are not differentiated timings in the spec and don't have any meaningful differences. Therefore, get rid of all references to SD_LEGACY and use MMC_LEGACY to mean both of them. Signed-off-by: Faiz Abbas <faiz_abbas@ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Showing 5 changed files with 7 additions and 13 deletions Side-by-side Diff
drivers/mmc/fsl_esdhc_imx.c
drivers/mmc/mmc.c
| ... | ... | @@ -132,7 +132,6 @@ |
| 132 | 132 | { |
| 133 | 133 | static const char *const names[] = { |
| 134 | 134 | [MMC_LEGACY] = "MMC legacy", |
| 135 | - [SD_LEGACY] = "SD Legacy", | |
| 136 | 135 | [MMC_HS] = "MMC High Speed (26MHz)", |
| 137 | 136 | [SD_HS] = "SD High Speed (50MHz)", |
| 138 | 137 | [UHS_SDR12] = "UHS SDR12 (25MHz)", |
| ... | ... | @@ -158,7 +157,6 @@ |
| 158 | 157 | { |
| 159 | 158 | static const int freqs[] = { |
| 160 | 159 | [MMC_LEGACY] = 25000000, |
| 161 | - [SD_LEGACY] = 25000000, | |
| 162 | 160 | [MMC_HS] = 26000000, |
| 163 | 161 | [SD_HS] = 50000000, |
| 164 | 162 | [MMC_HS_52] = 52000000, |
| ... | ... | @@ -1239,7 +1237,7 @@ |
| 1239 | 1237 | u32 sd3_bus_mode; |
| 1240 | 1238 | #endif |
| 1241 | 1239 | |
| 1242 | - mmc->card_caps = MMC_MODE_1BIT | MMC_CAP(SD_LEGACY); | |
| 1240 | + mmc->card_caps = MMC_MODE_1BIT | MMC_CAP(MMC_LEGACY); | |
| 1243 | 1241 | |
| 1244 | 1242 | if (mmc_host_is_spi(mmc)) |
| 1245 | 1243 | return 0; |
| ... | ... | @@ -1352,7 +1350,7 @@ |
| 1352 | 1350 | return 0; |
| 1353 | 1351 | |
| 1354 | 1352 | switch (mode) { |
| 1355 | - case SD_LEGACY: | |
| 1353 | + case MMC_LEGACY: | |
| 1356 | 1354 | speed = UHS_SDR12_BUS_SPEED; |
| 1357 | 1355 | break; |
| 1358 | 1356 | case SD_HS: |
| ... | ... | @@ -1695,7 +1693,7 @@ |
| 1695 | 1693 | }, |
| 1696 | 1694 | #endif |
| 1697 | 1695 | { |
| 1698 | - .mode = SD_LEGACY, | |
| 1696 | + .mode = MMC_LEGACY, | |
| 1699 | 1697 | .widths = MMC_MODE_4BIT | MMC_MODE_1BIT, |
| 1700 | 1698 | } |
| 1701 | 1699 | }; |
| ... | ... | @@ -1725,7 +1723,7 @@ |
| 1725 | 1723 | |
| 1726 | 1724 | if (mmc_host_is_spi(mmc)) { |
| 1727 | 1725 | mmc_set_bus_width(mmc, 1); |
| 1728 | - mmc_select_mode(mmc, SD_LEGACY); | |
| 1726 | + mmc_select_mode(mmc, MMC_LEGACY); | |
| 1729 | 1727 | mmc_set_clock(mmc, mmc->tran_speed, MMC_CLK_ENABLE); |
| 1730 | 1728 | return 0; |
| 1731 | 1729 | } |
| ... | ... | @@ -1784,7 +1782,7 @@ |
| 1784 | 1782 | |
| 1785 | 1783 | error: |
| 1786 | 1784 | /* revert to a safer bus speed */ |
| 1787 | - mmc_select_mode(mmc, SD_LEGACY); | |
| 1785 | + mmc_select_mode(mmc, MMC_LEGACY); | |
| 1788 | 1786 | mmc_set_clock(mmc, mmc->tran_speed, |
| 1789 | 1787 | MMC_CLK_ENABLE); |
| 1790 | 1788 | } |
| ... | ... | @@ -2561,7 +2559,7 @@ |
| 2561 | 2559 | |
| 2562 | 2560 | #if CONFIG_IS_ENABLED(MMC_TINY) |
| 2563 | 2561 | mmc_set_clock(mmc, mmc->legacy_speed, false); |
| 2564 | - mmc_select_mode(mmc, IS_SD(mmc) ? SD_LEGACY : MMC_LEGACY); | |
| 2562 | + mmc_select_mode(mmc, MMC_LEGACY); | |
| 2565 | 2563 | mmc_set_bus_width(mmc, 1); |
| 2566 | 2564 | #else |
| 2567 | 2565 | if (IS_SD(mmc)) { |
| ... | ... | @@ -2843,7 +2841,7 @@ |
| 2843 | 2841 | * all hosts are capable of 1 bit bus-width and able to use the legacy |
| 2844 | 2842 | * timings. |
| 2845 | 2843 | */ |
| 2846 | - mmc->host_caps = mmc->cfg->host_caps | MMC_CAP(SD_LEGACY) | | |
| 2844 | + mmc->host_caps = mmc->cfg->host_caps | MMC_CAP(MMC_LEGACY) | | |
| 2847 | 2845 | MMC_CAP(MMC_LEGACY) | MMC_MODE_1BIT; |
| 2848 | 2846 | #if CONFIG_IS_ENABLED(DM_MMC) |
| 2849 | 2847 | mmc_deferred_probe(mmc); |
drivers/mmc/omap_hsmmc.c
drivers/mmc/zynq_sdhci.c