linux-mmc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dong Aisheng <b29396@freescale.com>
To: linux-mmc@vger.kernel.org
Cc: ulf.hansson@linaro.org, shawn.guo@linaro.org,
	b29396@freescale.com, chris@printf.net,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/7] mmc: sdhci-esdhc-imx: add imx6sx support
Date: Wed, 3 Sep 2014 20:05:02 +0800	[thread overview]
Message-ID: <1409745903-26550-7-git-send-email-b29396@freescale.com> (raw)
In-Reply-To: <1409745903-26550-1-git-send-email-b29396@freescale.com>

The imx6sx usdhc is derived from imx6sl, the difference is minor.
imx6sx have the errata ESDHC_FLAG_ERR004536 fixed.
So introduce a new compatible string for imx6sx to distinguish them.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
---
 drivers/mmc/host/sdhci-esdhc-imx.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index dc0e384..87179c4 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -150,6 +150,11 @@ static struct esdhc_soc_data usdhc_imx6sl_data = {
 			| ESDHC_FLAG_HAVE_CAP1 | ESDHC_FLAG_ERR004536,
 };
 
+static struct esdhc_soc_data usdhc_imx6sx_data = {
+	.flags = ESDHC_FLAG_USDHC | ESDHC_FLAG_STD_TUNING
+			| ESDHC_FLAG_HAVE_CAP1,
+};
+
 struct pltfm_imx_data {
 	u32 scratchpad;
 	struct pinctrl *pinctrl;
@@ -190,6 +195,7 @@ static const struct of_device_id imx_esdhc_dt_ids[] = {
 	{ .compatible = "fsl,imx35-esdhc", .data = &esdhc_imx35_data, },
 	{ .compatible = "fsl,imx51-esdhc", .data = &esdhc_imx51_data, },
 	{ .compatible = "fsl,imx53-esdhc", .data = &esdhc_imx53_data, },
+	{ .compatible = "fsl,imx6sx-usdhc", .data = &usdhc_imx6sx_data, },
 	{ .compatible = "fsl,imx6sl-usdhc", .data = &usdhc_imx6sl_data, },
 	{ .compatible = "fsl,imx6q-usdhc", .data = &usdhc_imx6q_data, },
 	{ /* sentinel */ }
-- 
1.7.8

  parent reply	other threads:[~2014-09-03 12:05 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-03 12:04 [PATCH 0/7] mmc: sdhci/imx: a few clean up and fixes Dong Aisheng
2014-09-03 12:04 ` [PATCH 1/7] mmc: sdhci-esdhc-imx: remove duplicated lines Dong Aisheng
2014-09-03 12:04 ` [PATCH 2/7] mmc: sdhci-esdhc-imx: usdhc does not have missing card interrupt issue Dong Aisheng
2014-09-03 12:04 ` [PATCH 3/7] mmc: sdhci-esdhc-imx: add ADMA Length Mismatch errata fix Dong Aisheng
2014-09-03 12:05 ` [PATCH 4/7] mmc: sdhci: do not enable card detect interrupt for gpio cd type Dong Aisheng
2014-09-03 12:05 ` [PATCH 5/7] mmc: sdhci: do not enable card cd wakeup for gpio case Dong Aisheng
2014-09-03 12:05 ` Dong Aisheng [this message]
2014-09-17 22:29   ` [PATCH 6/7] mmc: sdhci-esdhc-imx: add imx6sx support Ulf Hansson
2014-09-18  5:35     ` Dong Aisheng
2014-09-19 17:54       ` Ulf Hansson
2014-09-03 12:05 ` [PATCH 7/7] mmc: sdhci-esdhc-imx: add quirk SDHCI_QUIRK2_BROKEN_HS200 for imx6qdl Dong Aisheng
2014-09-03 12:34 ` [PATCH 0/7] mmc: sdhci/imx: a few clean up and fixes Fabio Estevam
2014-09-03 12:19   ` Dong Aisheng
2014-09-04  5:07 ` Shawn Guo

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=1409745903-26550-7-git-send-email-b29396@freescale.com \
    --to=b29396@freescale.com \
    --cc=chris@printf.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=shawn.guo@linaro.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).