Skip to contentSkip to conversation

mmc: sdhci: Apply FSL ESDHC reset handling quirk to OF

PATCH In review Martin Hicks 2 participants 2 messages Jan 28, 2015 – Jan 29, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mmc: sdhci: Apply FSL ESDHC reset handling quirk to OF

The reset code was pushed into the esdhc-imx driver, but missed being pushed into the FSL OF driver at the same time. The commit that broke the OF ESDHC driver was 0718e59ae259f7c48155b4e852d8b0632d59028e

---
 drivers/mmc/host/sdhci-of-esdhc.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-of-esdhc.c +9 -1
index 8872c85..4a654d4 100644
@@ -276,6 +276,14 @@ static void esdhc_pltfm_set_bus_width(struct sdhci_host *host, int width)
 			ESDHC_CTRL_BUSWIDTH_MASK, ctrl);
 }
 
+static void esdhc_reset(struct sdhci_host *host, u8 mask)
+{
+	sdhci_reset(host, mask);
+
+	sdhci_writel(host, host->ier, SDHCI_INT_ENABLE);
+	sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE);
+}
+
 static const struct sdhci_ops sdhci_esdhc_ops = {
 	.read_l = esdhc_readl,
 	.read_w = esdhc_readw,
@@ -290,7 +298,7 @@ static const struct sdhci_ops sdhci_esdhc_ops = {
 	.platform_init = esdhc_of_platform_init,
 	.adma_workaround = esdhci_of_adma_workaround,
 	.set_bus_width = esdhc_pltfm_set_bus_width,
-	.reset = sdhci_reset,
+	.reset = esdhc_reset,
 	.set_uhs_signaling = sdhci_set_uhs_signaling,
 };
 
Signature · 10 lines
1.7.10.4


-- 
Martin Hicks P.Eng.    |      [email protected]
Bork Consulting Inc.   |  +1 (613) 266-2296
_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev
#1 lore raw
Quoted 6 lines · Martin Hicks

The reset code was pushed into the esdhc-imx driver, but missed being pushed into the FSL OF driver at the same time. The commit that broke the OF ESDHC driver was 0718e59ae259f7c48155b4e852d8b0632d59028e

Martin, thanks for the patch. Though I have already queued a patch for this issue. It's available on my next branch.

Alessio Igor Bogani <[email protected]>
mmc: sdhci: Fix FSL ESDHC reset handling quirk

Kind regards
Uffe

Quoted 43 lines
---
 drivers/mmc/host/sdhci-of-esdhc.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-of-esdhc.c +9 -2
index 8872c85..4a654d4 100644
@@ -276,6 +276,14 @@ static void esdhc_pltfm_set_bus_width(struct sdhci_host *host, int width)
                        ESDHC_CTRL_BUSWIDTH_MASK, ctrl);
 }
 
+static void esdhc_reset(struct sdhci_host *host, u8 mask)
+{
+       sdhci_reset(host, mask);
+
+       sdhci_writel(host, host->ier, SDHCI_INT_ENABLE);
+       sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE);
+}
+
 static const struct sdhci_ops sdhci_esdhc_ops = {
        .read_l = esdhc_readl,
        .read_w = esdhc_readw,
@@ -290,7 +298,7 @@ static const struct sdhci_ops sdhci_esdhc_ops = {
        .platform_init = esdhc_of_platform_init,
        .adma_workaround = esdhci_of_adma_workaround,
        .set_bus_width = esdhc_pltfm_set_bus_width,
-       .reset = sdhci_reset,
+       .reset = esdhc_reset,
        .set_uhs_signaling = sdhci_set_uhs_signaling,
 };
 
--

1.7.10.4

--
Martin Hicks P.Eng. | [email protected]
Bork Consulting Inc. | +1 (613) 266-2296
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html