1 From 5ee0de9d7abd644d4cb678fe26ac5130a1a8075f Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Fri, 2 Aug 2019 15:20:11 +0100
4 Subject: [PATCH] mmc: sdhci-iproc: Fix vmmc regulators on iProc
6 The Linux support for controlling card power via regulators appears to
7 be contentious. I would argue that the default behaviour is contrary to
8 the SDHCI spec - turning off the power writes a reserved value to the
9 SD Bus Voltage Select field of the Power Control Register, which
10 seems to kill the Arasan/iProc controller - but fortunately there is a
11 hook in sdhci_ops to override the behaviour. Borrow the implementation
12 from sdhci_arasan_set_power.
14 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
16 drivers/mmc/host/sdhci-iproc.c | 12 ++++++++++++
17 1 file changed, 12 insertions(+)
19 --- a/drivers/mmc/host/sdhci-iproc.c
20 +++ b/drivers/mmc/host/sdhci-iproc.c
21 @@ -162,6 +162,17 @@ static void sdhci_iproc_writeb(struct sd
22 sdhci_iproc_writel(host, newval, reg & ~3);
25 +static void sdhci_iproc_set_power(struct sdhci_host *host, unsigned char mode,
28 + if (!IS_ERR(host->mmc->supply.vmmc)) {
29 + struct mmc_host *mmc = host->mmc;
31 + mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);
33 + sdhci_set_power_noreg(host, mode, vdd);
36 static const struct sdhci_ops sdhci_iproc_ops = {
37 .set_clock = sdhci_set_clock,
38 .get_max_clock = sdhci_pltfm_clk_get_max_clock,
39 @@ -178,6 +189,7 @@ static const struct sdhci_ops sdhci_ipro
40 .write_w = sdhci_iproc_writew,
41 .write_b = sdhci_iproc_writeb,
42 .set_clock = sdhci_set_clock,
43 + .set_power = sdhci_iproc_set_power,
44 .get_max_clock = sdhci_pltfm_clk_get_max_clock,
45 .set_bus_width = sdhci_set_bus_width,