| From 7e2646ed47542123168d43916b84b954532e5386 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org> |
| Date: Fri, 18 Mar 2022 15:14:41 +0100 |
| Subject: Revert "mmc: sdhci-xenon: fix annoying 1.8V regulator warning" |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Pali Rohár <pali@kernel.org> |
| |
| commit 7e2646ed47542123168d43916b84b954532e5386 upstream. |
| |
| This reverts commit bb32e1987bc55ce1db400faf47d85891da3c9b9f. |
| |
| Commit 1a3ed0dc3594 ("mmc: sdhci-xenon: fix 1.8v regulator stabilization") |
| contains proper fix for the issue described in commit bb32e1987bc5 ("mmc: |
| sdhci-xenon: fix annoying 1.8V regulator warning"). |
| |
| Fixes: 8d876bf472db ("mmc: sdhci-xenon: wait 5ms after set 1.8V signal enable") |
| Cc: stable@vger.kernel.org # 1a3ed0dc3594 ("mmc: sdhci-xenon: fix 1.8v regulator stabilization") |
| Signed-off-by: Pali Rohár <pali@kernel.org> |
| Reviewed-by: Marek Behún <kabel@kernel.org> |
| Reviewed-by: Marcin Wojtas <mw@semihalf.com> |
| Link: https://lore.kernel.org/r/20220318141441.32329-1-pali@kernel.org |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/mmc/host/sdhci-xenon.c | 10 ---------- |
| 1 file changed, 10 deletions(-) |
| |
| --- a/drivers/mmc/host/sdhci-xenon.c |
| +++ b/drivers/mmc/host/sdhci-xenon.c |
| @@ -241,16 +241,6 @@ static void xenon_voltage_switch(struct |
| { |
| /* Wait for 5ms after set 1.8V signal enable bit */ |
| usleep_range(5000, 5500); |
| - |
| - /* |
| - * For some reason the controller's Host Control2 register reports |
| - * the bit representing 1.8V signaling as 0 when read after it was |
| - * written as 1. Subsequent read reports 1. |
| - * |
| - * Since this may cause some issues, do an empty read of the Host |
| - * Control2 register here to circumvent this. |
| - */ |
| - sdhci_readw(host, SDHCI_HOST_CONTROL2); |
| } |
| |
| static unsigned int xenon_get_max_clock(struct sdhci_host *host) |
