mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
MMC core:
- Don't re-tune in the reset sequence to allow re-init of the card -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJWJ028AAoJEP4mhCVzWIwpmFEQAKvyEdBCdIzf8U5jAnqmUBp2 tF/6qKpHcyKcKopHH+fsx2mdZoCwq5my+UNnY6PsSbCLpNT7m7ea/cD/I1yWRWR0 qXPqbZddM71xyJ0VLBbGubpgqbR9ofPa5Bg7V6JT74P/5EXORSt1wmLcy0QLeI4y WQlmdL9xzEk5MKHyAXFURiyexXZSmRyw8YUV6vOESwv1/O18sTeKo3NerQx9urc+ DqyID9+uPvqesQ09IcboaZT5KtTpGAh0O52EiKl90Fv/4yLuXD3dV6DhsI4B1use jVnCFrCOdXT7cpugOGht7aDnP8Sga1k4jTBiWS97CusMykwc7kIF8Yty3LlKr510 tglarnSvmhYSrY0uR1YGWugfwgg+8V5SrolZa+zMg+hHwSIvWLybnJkUtdaNSB1r k0Q97k0mKUT7hTAhd60U7XTMOrumb2w1VdY0/BRGtm8J6XwEhnjF+j8h7CRqCzIn HJuvZ7AhfUjr93ASMfzebNaSEFIt8I0G0fIv+YP0nu5WnkySfgC7Q4LZzwy/MC4/ V9rqdq0iObHZmIyYEydgudmdXYkR5lSp1SenVQ3kBT/xE1Ygcj5ujdfEHxpVoz0C owqjaKL5zXOOVB7/bhKnyAXTu7f/lr/QPo0z8zoVVQqxEl+KP+5vyP1K/sN12zrj vz9c1MU7k7d7nSqlcOV5 =LHs/ -----END PGP SIGNATURE----- Merge tag 'mmc-v4.3-rc5' of git://git.linaro.org/people/ulf.hansson/mmc Pull MMC bugfix from Ulf Hansson: "Here's yet another MMC fix intended for v4.3 rc7. I don't expect to send any further pull requests for 4.3 rc[n]. MMC core: - Don't re-tune in the reset sequence to allow re-init of the card" * tag 'mmc-v4.3-rc5' of git://git.linaro.org/people/ulf.hansson/mmc: mmc: core: Fix init_card in 52Mhz
This commit is contained in:
commit
7f67786330
2 changed files with 3 additions and 13 deletions
|
@ -2263,15 +2263,12 @@ static int mmc_test_profile_sglen_r_nonblock_perf(struct mmc_test_card *test)
|
|||
/*
|
||||
* eMMC hardware reset.
|
||||
*/
|
||||
static int mmc_test_hw_reset(struct mmc_test_card *test)
|
||||
static int mmc_test_reset(struct mmc_test_card *test)
|
||||
{
|
||||
struct mmc_card *card = test->card;
|
||||
struct mmc_host *host = card->host;
|
||||
int err;
|
||||
|
||||
if (!mmc_card_mmc(card) || !mmc_can_reset(card))
|
||||
return RESULT_UNSUP_CARD;
|
||||
|
||||
err = mmc_hw_reset(host);
|
||||
if (!err)
|
||||
return RESULT_OK;
|
||||
|
@ -2605,8 +2602,8 @@ static const struct mmc_test_case mmc_test_cases[] = {
|
|||
},
|
||||
|
||||
{
|
||||
.name = "eMMC hardware reset",
|
||||
.run = mmc_test_hw_reset,
|
||||
.name = "Reset test",
|
||||
.run = mmc_test_reset,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
@ -1924,7 +1924,6 @@ EXPORT_SYMBOL(mmc_can_reset);
|
|||
static int mmc_reset(struct mmc_host *host)
|
||||
{
|
||||
struct mmc_card *card = host->card;
|
||||
u32 status;
|
||||
|
||||
if (!(host->caps & MMC_CAP_HW_RESET) || !host->ops->hw_reset)
|
||||
return -EOPNOTSUPP;
|
||||
|
@ -1937,12 +1936,6 @@ static int mmc_reset(struct mmc_host *host)
|
|||
|
||||
host->ops->hw_reset(host);
|
||||
|
||||
/* If the reset has happened, then a status command will fail */
|
||||
if (!mmc_send_status(card, &status)) {
|
||||
mmc_host_clk_release(host);
|
||||
return -ENOSYS;
|
||||
}
|
||||
|
||||
/* Set initial state and call mmc_set_ios */
|
||||
mmc_set_initial_state(host);
|
||||
mmc_host_clk_release(host);
|
||||
|
|
Loading…
Reference in a new issue