Skip to contentSkip to conversation

Revert "mmc: sdhci-esdhc-imx: Call mmc_of_parse()"

PATCH Superseded Fabio Estevam 2 participants 2 messages Mar 19, 2015 – Mar 20, 2015

Subsystems (4)
Arm i.MX and Layerscape MMC, SD and SDIO Secure digital host controller interface (SDHCI) driver Secure digital host controller interface (SDHCI) NXP i.MX driver

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/1 Revert "mmc: sdhci-esdhc-imx: Call mmc_of_parse()"

From: Fabio Estevam <[email protected]>

Commit 46a3b345d38518 ("mmc: sdhci-esdhc-imx: Call mmc_of_parse()") caused regression on some mx6q platforms:

[    1.478666] sdhci: Secure Digital Host Controller Interface driver
[    1.484912] sdhci: Copyright(c) Pierre Ossman
[    1.489333] sdhci-pltfm: SDHCI platform and OF driver helper
[    1.496441] sdhci-esdhc-imx 2194000.usdhc: could not get ultra high speed state, work on normal mode
[    1.505878] sdhci-esdhc-imx: probe of 2194000.usdhc failed with error -16
Reported-by Olof's autobooter <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>

---
I don't have hardware access at the moment to debug this issue, so reverting it for now.

 drivers/mmc/host/sdhci-esdhc-imx.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/mmc/host/sdhci-esdhc-imx.c +0 -5
index 631e136..9cce5cf 100644
@@ -1075,11 +1075,6 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
 		host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V;
 	}
 
-	/* call to generic mmc_of_parse to support additional capabilities */
-	err = mmc_of_parse(host->mmc);
-	if (err)
-		goto disable_clk;
-
 	err = sdhci_add_host(host);
 	if (err)
 		goto disable_clk;
Signature · 1 line
1.9.1
#1 lore raw
Quoted 5 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Commit 46a3b345d38518 ("mmc: sdhci-esdhc-imx: Call mmc_of_parse()") caused regression on some mx6q platforms:

Quoted 8 lines
[    1.478666] sdhci: Secure Digital Host Controller Interface driver
[    1.484912] sdhci: Copyright(c) Pierre Ossman
[    1.489333] sdhci-pltfm: SDHCI platform and OF driver helper
[    1.496441] sdhci-esdhc-imx 2194000.usdhc: could not get ultra high speed state, work on normal mode
[    1.505878] sdhci-esdhc-imx: probe of 2194000.usdhc failed with error -16
Reported-by Olof's autobooter <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>

Olof, Fabio,

Thanks for looking into this.

Since I rebase my branch quite frequently, I preferred to just drop the original patch instead of applying the revert. So that done now!

Kind regards
Uffe

Quoted 26 lines

---
I don't have hardware access at the moment to debug this issue, so reverting it for now.

 drivers/mmc/host/sdhci-esdhc-imx.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/mmc/host/sdhci-esdhc-imx.c +0 -6
index 631e136..9cce5cf 100644
@@ -1075,11 +1075,6 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
                host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V;
        }
 
-       /* call to generic mmc_of_parse to support additional capabilities */
-       err = mmc_of_parse(host->mmc);
-       if (err)
-               goto disable_clk;
-
        err = sdhci_add_host(host);
        if (err)
                goto disable_clk;
--

1.9.1