aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDong Aisheng <b29396@freescale.com>2014-03-06 03:04:19 -0500
committerNitin Garg <nitin.garg@freescale.com>2014-04-16 09:57:51 -0400
commitab887497ca294e2956fe3073886b6a8e90f1c3ed (patch)
tree9a6f2f654d19e4ae9d3dc70ea8d354cc4a44b549
parent176a7d5137b22478acea3ac031bc359385e6923c (diff)
ENGR00302227-6 mmc: sdhci-esdhc-imx: add imx6sx support
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>
-rw-r--r--drivers/mmc/host/sdhci-esdhc-imx.c6
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 d2eb8911dc98..bf02355121ed 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 = {
150 | ESDHC_FLAG_BUSFREQ, 150 | ESDHC_FLAG_BUSFREQ,
151}; 151};
152 152
153static struct esdhc_soc_data usdhc_imx6sx_data = {
154 .flags = ESDHC_FLAG_USDHC | ESDHC_FLAG_STD_TUNING
155 | ESDHC_FLAG_HAVE_CAP1,
156};
157
153struct pltfm_imx_data { 158struct pltfm_imx_data {
154 u32 scratchpad; 159 u32 scratchpad;
155 struct pinctrl *pinctrl; 160 struct pinctrl *pinctrl;
@@ -191,6 +196,7 @@ static const struct of_device_id imx_esdhc_dt_ids[] = {
191 { .compatible = "fsl,imx35-esdhc", .data = &esdhc_imx35_data, }, 196 { .compatible = "fsl,imx35-esdhc", .data = &esdhc_imx35_data, },
192 { .compatible = "fsl,imx51-esdhc", .data = &esdhc_imx51_data, }, 197 { .compatible = "fsl,imx51-esdhc", .data = &esdhc_imx51_data, },
193 { .compatible = "fsl,imx53-esdhc", .data = &esdhc_imx53_data, }, 198 { .compatible = "fsl,imx53-esdhc", .data = &esdhc_imx53_data, },
199 { .compatible = "fsl,imx6sx-usdhc", .data = &usdhc_imx6sx_data, },
194 { .compatible = "fsl,imx6sl-usdhc", .data = &usdhc_imx6sl_data, }, 200 { .compatible = "fsl,imx6sl-usdhc", .data = &usdhc_imx6sl_data, },
195 { .compatible = "fsl,imx6q-usdhc", .data = &usdhc_imx6q_data, }, 201 { .compatible = "fsl,imx6q-usdhc", .data = &usdhc_imx6q_data, },
196 { /* sentinel */ } 202 { /* sentinel */ }