summaryrefslogtreecommitdiffstats
path: root/drivers/mci
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2015-03-09 08:32:26 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2015-03-09 08:32:26 +0100
commitfa20ea45e0955f07229f0fbf646ac5e5e04f5a33 (patch)
tree4736a5bd899599e02a08c02a5cdc8e77218b1012 /drivers/mci
parent4680b375b9dd32e6558ae2ee8a15b27819c70e73 (diff)
parentf5eaa68abf2af676bd34257af436ecba85bbf78a (diff)
downloadbarebox-fa20ea45e0955f07229f0fbf646ac5e5e04f5a33.tar.gz
barebox-fa20ea45e0955f07229f0fbf646ac5e5e04f5a33.tar.xz
Merge branch 'for-next/tegra'
Diffstat (limited to 'drivers/mci')
-rw-r--r--drivers/mci/tegra-sdmmc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mci/tegra-sdmmc.c b/drivers/mci/tegra-sdmmc.c
index 670c280cb8..14c230483f 100644
--- a/drivers/mci/tegra-sdmmc.c
+++ b/drivers/mci/tegra-sdmmc.c
@@ -411,7 +411,10 @@ static int tegra_sdmmc_detect(struct device_d *dev)
static void tegra_sdmmc_parse_dt(struct tegra_sdmmc_host *host)
{
struct device_node *np = host->mci.hw_dev->device_node;
+ const char *alias = of_alias_get(np);
+ if (alias)
+ host->mci.devname = xstrdup(alias);
host->gpio_cd = of_get_named_gpio(np, "cd-gpios", 0);
host->gpio_pwr = of_get_named_gpio(np, "power-gpios", 0);
mci_of_parse(&host->mci);