summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-11-29 16:52:05 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-12-17 08:42:32 +0100
commitde3c258d41bc1102b25b1786085fd5310eaf1057 (patch)
tree03e6f10c313a6a9e21e0cc434dfdc67357e00b28
parent30eb68037835061a4003a7a279b15a1e78c6d4ac (diff)
downloadbarebox-de3c258d41bc1102b25b1786085fd5310eaf1057.tar.gz
barebox-de3c258d41bc1102b25b1786085fd5310eaf1057.tar.xz
mci i.MX esdhc: Allow to specify devicename from platformdata
For boards which need to have persistent names for the device file. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-imx/include/mach/esdhc.h1
-rw-r--r--drivers/mci/imx-esdhc.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/include/mach/esdhc.h b/arch/arm/mach-imx/include/mach/esdhc.h
index b4c1aa9ebe..06863c8f1b 100644
--- a/arch/arm/mach-imx/include/mach/esdhc.h
+++ b/arch/arm/mach-imx/include/mach/esdhc.h
@@ -41,5 +41,6 @@ struct esdhc_platform_data {
enum wp_types wp_type;
enum cd_types cd_type;
unsigned caps;
+ char *devname;
};
#endif /* __ASM_ARCH_IMX_ESDHC_H */
diff --git a/drivers/mci/imx-esdhc.c b/drivers/mci/imx-esdhc.c
index e8075a9d92..dfeb509db4 100644
--- a/drivers/mci/imx-esdhc.c
+++ b/drivers/mci/imx-esdhc.c
@@ -552,6 +552,9 @@ static int fsl_esdhc_probe(struct device_d *dev)
else
mci->host_caps = MMC_MODE_4BIT;
+ if (pdata && pdata->devname)
+ mci->devname = pdata->devname;
+
if (caps & ESDHC_HOSTCAPBLT_HSS)
mci->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS;