Commit dcb1f291f2c60d04cb380e370ffa21f4be56451e
1 parent
8da1ef6044
Exists in
smarc_8mq_lf_v2020.04
and in
4 other branches
Revert "mmc: rework mmc_set_initial_state"
This reverts commit ef959d695523c391a68093550a3bfb8714ab7ac9. The changes needs rework to work on i.mx devices LFU-40 Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com>
Showing 1 changed file with 9 additions and 12 deletions Side-by-side Diff
drivers/mmc/mmc.c
| ... | ... | @@ -2690,19 +2690,16 @@ |
| 2690 | 2690 | { |
| 2691 | 2691 | int err; |
| 2692 | 2692 | |
| 2693 | - mmc->signal_voltage = MMC_SIGNAL_VOLTAGE_330; | |
| 2694 | - mmc_select_mode(mmc, MMC_LEGACY); | |
| 2695 | - mmc->bus_width = 1; | |
| 2696 | - mmc->clock = 0; | |
| 2697 | - mmc->clk_disable = MMC_CLK_ENABLE; | |
| 2693 | + /* First try to set 3.3V. If it fails set to 1.8V */ | |
| 2694 | + err = mmc_set_signal_voltage(mmc, MMC_SIGNAL_VOLTAGE_330); | |
| 2695 | + if (err != 0) | |
| 2696 | + err = mmc_set_signal_voltage(mmc, MMC_SIGNAL_VOLTAGE_180); | |
| 2697 | + if (err != 0) | |
| 2698 | + pr_warn("mmc: failed to set signal voltage\n"); | |
| 2698 | 2699 | |
| 2699 | - err = mmc_set_ios(mmc); | |
| 2700 | - if (err) | |
| 2701 | - mmc->signal_voltage = MMC_SIGNAL_VOLTAGE_180; | |
| 2702 | - | |
| 2703 | - err = mmc_set_ios(mmc); | |
| 2704 | - if (err) | |
| 2705 | - pr_warn("mmc: failed to set initial state\n"); | |
| 2700 | + mmc_select_mode(mmc, MMC_LEGACY); | |
| 2701 | + mmc_set_bus_width(mmc, 1); | |
| 2702 | + mmc_set_clock(mmc, 0, MMC_CLK_ENABLE); | |
| 2706 | 2703 | } |
| 2707 | 2704 | |
| 2708 | 2705 | static int mmc_power_on(struct mmc *mmc) |