summaryrefslogtreecommitdiffstats
path: root/drivers/mci
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mci')
-rw-r--r--drivers/mci/imx-esdhc.c6
-rw-r--r--drivers/mci/omap_hsmmc.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mci/imx-esdhc.c b/drivers/mci/imx-esdhc.c
index d72e3f8c80..951ac4501b 100644
--- a/drivers/mci/imx-esdhc.c
+++ b/drivers/mci/imx-esdhc.c
@@ -719,15 +719,19 @@ static struct esdhc_soc_data usdhc_imx6sl_data = {
| ESDHC_FLAG_HS200,
};
+static struct esdhc_soc_data usdhc_imx6sx_data = {
+ .flags = ESDHC_FLAG_USDHC | ESDHC_FLAG_STD_TUNING
+ | ESDHC_FLAG_HAVE_CAP1 | ESDHC_FLAG_HS200,
+};
static __maybe_unused struct of_device_id fsl_esdhc_compatible[] = {
-
{ .compatible = "fsl,imx25-esdhc", .data = &esdhc_imx25_data },
{ .compatible = "fsl,imx50-esdhc", .data = &esdhc_imx50_data },
{ .compatible = "fsl,imx51-esdhc", .data = &esdhc_imx51_data },
{ .compatible = "fsl,imx53-esdhc", .data = &esdhc_imx53_data },
{ .compatible = "fsl,imx6q-usdhc", .data = &usdhc_imx6q_data },
{ .compatible = "fsl,imx6sl-usdhc", .data = &usdhc_imx6sl_data },
+ { .compatible = "fsl,imx6sx-usdhc", .data = &usdhc_imx6sx_data },
{ /* sentinel */ }
};
diff --git a/drivers/mci/omap_hsmmc.c b/drivers/mci/omap_hsmmc.c
index 180afb16c9..cbc69e4083 100644
--- a/drivers/mci/omap_hsmmc.c
+++ b/drivers/mci/omap_hsmmc.c
@@ -631,6 +631,8 @@ static int omap_mmc_probe(struct device_d *dev)
hsmmc->mci.devname = xstrdup(alias);
}
+ mci_of_parse(&hsmmc->mci);
+
dev->priv = hsmmc;
dev->detect = omap_mmc_detect,