diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:27 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:27 +0100 |
| commit | 6d7fae1e97d67b635a972b0f1f5c6a140c596e95 (patch) | |
| tree | 8e12b54c5b1bb7e518a920b2b8446b59f42587ae /drivers/mci | |
| parent | e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa (diff) | |
| parent | 8cf612878ef9b297d304db1574b5604ddc675b58 (diff) | |
| download | barebox-6d7fae1e97d67b635a972b0f1f5c6a140c596e95.tar.gz barebox-6d7fae1e97d67b635a972b0f1f5c6a140c596e95.tar.xz | |
Merge branch 'for-next/omap-devicetree-prepare'
Diffstat (limited to 'drivers/mci')
| -rw-r--r-- | drivers/mci/omap_hsmmc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mci/omap_hsmmc.c b/drivers/mci/omap_hsmmc.c index 19db461e0d..357d99a0db 100644 --- a/drivers/mci/omap_hsmmc.c +++ b/drivers/mci/omap_hsmmc.c @@ -620,6 +620,12 @@ static int omap_mmc_probe(struct device_d *dev) hsmmc->mci.devname = pdata->devname; } + if (dev->device_node) { + const char *alias = of_alias_get(dev->device_node); + if (alias) + hsmmc->mci.devname = xstrdup(alias); + } + dev->priv = hsmmc; dev->detect = omap_mmc_detect, |