summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/sdhci-pxav3.c
diff options
context:
space:
mode:
authorSebastian Hesselbarth2014-10-21 11:22:39 +0200
committerUlf Hansson2014-11-10 12:40:47 +0100
commit01ae1070cbb5fbb3bffa0df44e422521df2b4ab1 (patch)
treebe758cfd46f8e2bcc797a4e9c2320d87f05955c6 /drivers/mmc/host/sdhci-pxav3.c
parentmmc: sdhci-pxav3: Move I/O clock to private data (diff)
downloadkernel-qcow2-linux-01ae1070cbb5fbb3bffa0df44e422521df2b4ab1.tar.gz
kernel-qcow2-linux-01ae1070cbb5fbb3bffa0df44e422521df2b4ab1.tar.xz
kernel-qcow2-linux-01ae1070cbb5fbb3bffa0df44e422521df2b4ab1.zip
mmc: sdhci-pxav3: Try to get named I/O clock first
With support for more than one clock, we'll need to distinguish between the clock by name. Change clock probing to first try to get "io" clock before falling back to unnamed clock. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host/sdhci-pxav3.c')
-rw-r--r--drivers/mmc/host/sdhci-pxav3.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
index a34a589670e6..3dfd97977515 100644
--- a/drivers/mmc/host/sdhci-pxav3.c
+++ b/drivers/mmc/host/sdhci-pxav3.c
@@ -309,7 +309,9 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
pltfm_host = sdhci_priv(host);
pltfm_host->priv = pxa;
- pxa->clk_io = devm_clk_get(dev, NULL);
+ pxa->clk_io = devm_clk_get(dev, "io");
+ if (IS_ERR(pxa->clk_io))
+ pxa->clk_io = devm_clk_get(dev, NULL);
if (IS_ERR(pxa->clk_io)) {
dev_err(dev, "failed to get io clock\n");
ret = PTR_ERR(pxa->clk_io);