Skip to contentSkip to conversation

Patch "mmc: sdhci-esdhc-imx: Move mmc_of_parse() to the dt probe" has been added to the 4.1-stable tree

PATCH [email protected] 1 participant 1 message Oct 17, 2015

Subsystems (5)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

mmc: sdhci-esdhc-imx: Move mmc_of_parse() to the dt probe

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mmc-sdhci-esdhc-imx-move-mmc_of_parse-to-the-dt-probe.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 15064119273735c115fba381823b0746508bae3a Mon Sep 17 00:00:00 2001

From: Fabio Estevam <[email protected]>
Date: Sat, 9 May 2015 09:57:08 -0300
Subject: mmc: sdhci-esdhc-imx: Move mmc_of_parse() to the dt probe

From: Fabio Estevam <[email protected]>

commit 15064119273735c115fba381823b0746508bae3a upstream.

mmc_of_parse() should be placed inside sdhci_esdhc_imx_probe_dt() as it suits only for the dt case.

---
 drivers/mmc/host/sdhci-esdhc-imx.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/mmc/host/sdhci-esdhc-imx.c +2 -6
@@ -903,7 +903,8 @@ sdhci_esdhc_imx_probe_dt(struct platform
 
 	mmc_of_parse_voltage(np, &host->ocr_mask);
 
-	return 0;
+	/* call to generic mmc_of_parse to support additional capabilities */
+	return mmc_of_parse(host->mmc);
 }
 #else
 static inline int
@@ -1048,11 +1049,6 @@ static int sdhci_esdhc_imx_probe(struct
 		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;

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/mmc-sdhci-esdhc-imx-do-not-break-platform-data-boards.patch queue-4.1/dts-imx51-fix-sd-card-gpio-polarity-specified-in-device-tree.patch queue-4.1/mmc-sdhci-esdhc-imx-move-mmc_of_parse-to-the-dt-probe.patch queue-4.1/dts-imx6-fix-sd-card-gpio-polarity-specified-in-device-tree.patch queue-4.1/dts-imx25-fix-sd-card-gpio-polarity-specified-in-device-tree.patch queue-4.1/dts-imx53-fix-sd-card-gpio-polarity-specified-in-device-tree.patch queue-4.1/mmc-sdhci-esdhc-imx-fix-cd-regression-for-dt-platform.patch