From: <gregkh@linuxfoundation.org>
To: fabio.estevam@freescale.com, gregkh@linuxfoundation.org,
ulf.hansson@linaro.org
Cc: <stable@vger.kernel.org>, <stable-commits@vger.kernel.org>
Subject: Patch "mmc: sdhci-esdhc-imx: Move mmc_of_parse() to the dt probe" has been added to the 4.1-stable tree
Date: Sat, 17 Oct 2015 15:04:32 -0700 [thread overview]
Message-ID: <144511947220535@kroah.com> (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 <stable@vger.kernel.org> know about it.
>From 15064119273735c115fba381823b0746508bae3a Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@freescale.com>
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 <fabio.estevam@freescale.com>
commit 15064119273735c115fba381823b0746508bae3a upstream.
mmc_of_parse() should be placed inside sdhci_esdhc_imx_probe_dt() as it
suits only for the dt case.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/mmc/host/sdhci-esdhc-imx.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -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 fabio.estevam@freescale.com 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
reply other threads:[~2015-10-17 22:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=144511947220535@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=fabio.estevam@freescale.com \
--cc=stable-commits@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.