This reverts commit 04a2ea248f58b3b6216d0cd0a6b8698df8b14355.
That commit is causing reboot loops on Nokia N900 and basically make U-Boot on Nokia N900 unusable. Revert it for now until problem is solved.
After reverting that commit U-Boot on Nokia N900 is working again.
Signed-off-by: Pali Rohár pali@kernel.org --- drivers/mmc/mmc.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index d79cdef62e..48c1629a19 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -2800,18 +2800,7 @@ int mmc_get_op_cond(struct mmc *mmc) MMC_QUIRK_RETRY_APP_CMD; #endif
- err = mmc_power_cycle(mmc); - if (err) { - /* - * if power cycling is not supported, we should not try - * to use the UHS modes, because we wouldn't be able to - * recover from an error during the UHS initialization. - */ - pr_debug("Unable to do a full power cycle. Disabling the UHS modes for safety\n"); - uhs_en = false; - mmc->host_caps &= ~UHS_CAPS; - err = mmc_power_on(mmc); - } + err = mmc_power_on(mmc); if (err) return err;