| From 2ca71c27eeaeddae38efe24a84b20e22708a3d1d Mon Sep 17 00:00:00 2001 |
| From: Adrian Hunter <adrian.hunter@intel.com> |
| Date: Fri, 2 Dec 2016 15:14:19 +0200 |
| Subject: Revert "mmc: sdhci: Reset cmd and data circuits after tuning failure" |
| |
| From: Adrian Hunter <adrian.hunter@intel.com> |
| |
| commit 2ca71c27eeaeddae38efe24a84b20e22708a3d1d upstream. |
| |
| This reverts commit fe5fb2e3b58f ("mmc: sdhci: Reset cmd and data circuits |
| after tuning failure"). |
| |
| A better fix is available, and it will be applied to older stable releases, |
| so get this out of the way by reverting it. |
| |
| Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/mmc/host/sdhci.c | 4 ---- |
| 1 file changed, 4 deletions(-) |
| |
| --- a/drivers/mmc/host/sdhci.c |
| +++ b/drivers/mmc/host/sdhci.c |
| @@ -2086,10 +2086,6 @@ static int sdhci_execute_tuning(struct m |
| |
| if (!host->tuning_done) { |
| pr_info(DRIVER_NAME ": Timeout waiting for Buffer Read Ready interrupt during tuning procedure, falling back to fixed sampling clock\n"); |
| - |
| - sdhci_do_reset(host, SDHCI_RESET_CMD); |
| - sdhci_do_reset(host, SDHCI_RESET_DATA); |
| - |
| ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2); |
| ctrl &= ~SDHCI_CTRL_TUNED_CLK; |
| ctrl &= ~SDHCI_CTRL_EXEC_TUNING; |
