Skip to content

Commit bb32e19

Browse files
elkablostorulf
authored andcommitted
mmc: sdhci-xenon: fix annoying 1.8V regulator warning
For some reason the Host Control2 register of the Xenon SDHCI controller sometimes reports the bit representing 1.8V signaling as 0 when read after it was written as 1. Subsequent read reports 1. This causes the sdhci_start_signal_voltage_switch function to report 1.8V regulator output did not become stable When CONFIG_PM is enabled, the host is suspended and resumend many times, and in each resume the switch to 1.8V is called, and so the kernel log reports this message annoyingly often. Do an empty read of the Host Control2 register in Xenon's .voltage_switch method to circumvent this. This patch fixes this particular problem on Turris MOX. Signed-off-by: Marek Behún <[email protected]> Fixes: 8d876bf ("mmc: sdhci-xenon: wait 5ms after set 1.8V...") Cc: [email protected] # v4.16+ Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Ulf Hansson <[email protected]>
1 parent 9d8cb58 commit bb32e19

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

drivers/mmc/host/sdhci-xenon.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,16 @@ static void xenon_voltage_switch(struct sdhci_host *host)
235235
{
236236
/* Wait for 5ms after set 1.8V signal enable bit */
237237
usleep_range(5000, 5500);
238+
239+
/*
240+
* For some reason the controller's Host Control2 register reports
241+
* the bit representing 1.8V signaling as 0 when read after it was
242+
* written as 1. Subsequent read reports 1.
243+
*
244+
* Since this may cause some issues, do an empty read of the Host
245+
* Control2 register here to circumvent this.
246+
*/
247+
sdhci_readw(host, SDHCI_HOST_CONTROL2);
238248
}
239249

240250
static const struct sdhci_ops sdhci_xenon_ops = {

0 commit comments

Comments
 (0)