diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-05-09 08:49:43 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-05-09 08:49:43 +0200 |
| commit | 4cb8e17aa3972e27f4b34e5bb2df9e7007824ac2 (patch) | |
| tree | 942b24dcd275407d76f6b3ef85f6db9af1160163 /drivers/mci | |
| parent | 854df603da65bc56fe72218b402903f26155b0f0 (diff) | |
| parent | 79fdb84a6b46f7c129225b57007b63e765747d52 (diff) | |
| download | barebox-4cb8e17aa3972e27f4b34e5bb2df9e7007824ac2.tar.gz barebox-4cb8e17aa3972e27f4b34e5bb2df9e7007824ac2.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/mci')
| -rw-r--r-- | drivers/mci/mxs.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/mci/mxs.c b/drivers/mci/mxs.c index 2355651022..446da8ad53 100644 --- a/drivers/mci/mxs.c +++ b/drivers/mci/mxs.c @@ -571,7 +571,15 @@ static int mxs_mci_probe(struct device_d *hw_dev) host->f_min = pd->f_min; host->f_max = pd->f_max; } else { - host->voltages = MMC_VDD_32_33 | MMC_VDD_33_34, /* fixed to 3.3 V */ + /* fixed to 3.3 V */ + host->voltages = MMC_VDD_32_33 | MMC_VDD_33_34; + + if (hw_dev->device_node) { + const char *alias = of_alias_get(hw_dev->device_node); + if (alias) + host->devname = xstrdup(alias); + } + mci_of_parse(host); } |