Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0869cb9f authored by Pali Rohár's avatar Pali Rohár Committed by Greg Kroah-Hartman
Browse files

Revert "mmc: sdhci-xenon: fix annoying 1.8V regulator warning" 



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: 8d876bf4 ("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: default avatarPali Rohár <pali@kernel.org>
Reviewed-by: default avatarMarek Behún <kabel@kernel.org>
Reviewed-by: default avatarMarcin Wojtas <mw@semihalf.com>
Link: https://lore.kernel.org/r/20220318141441.32329-1-pali@kernel.org


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c79c1846

drivers/mmc/host/sdhci-xenon.c

+0 −10
Original line number Diff line number Diff line
@@ -240,16 +240,6 @@ static void xenon_voltage_switch(struct sdhci_host *host) 
{

	/* 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 const struct sdhci_ops sdhci_xenon_ops = {