diff options
| author |   Eric Anholt <eric@anholt.net> | 2015-05-29 14:06:12 -0700 |
|---|---|---|
| committer |   Ulf Hansson <ulf.hansson@linaro.org> | 2015-06-01 09:56:07 +0200 |
| commit | 1e5a0a9a58e2977e6542074b25b96be93208dccf (patch) | |
| tree | be2f379a4e3e3c4b4cdd0d864085c5bff20827af /drivers/mmc | |
| parent | mmc: sdhci-bcm2835: Clean up platform allocations if sdhci init fails. (diff) | |
| download | linux-dev-1e5a0a9a58e2977e6542074b25b96be93208dccf.tar.xz linux-dev-1e5a0a9a58e2977e6542074b25b96be93208dccf.zip | |
mmc: sdhci-bcm2835: Actually enable the clock
We're currently using a fixed frequency clock specified in the DT, so
enabling is a no-op. However, the RPi firmware-based clocks driver
can actually disable unused clocks, so when switching to use it we
ended up losing our MMC clock once all devices were probed.
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci-bcm2835.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-bcm2835.c b/drivers/mmc/host/sdhci-bcm2835.c index 32f4046546b5..1c65d4690e70 100644 --- a/drivers/mmc/host/sdhci-bcm2835.c +++ b/drivers/mmc/host/sdhci-bcm2835.c @@ -172,12 +172,19 @@ static int bcm2835_sdhci_probe(struct platform_device *pdev) ret = PTR_ERR(pltfm_host->clk); goto err; } + ret = clk_prepare_enable(pltfm_host->clk); + if (ret) { + dev_err(&pdev->dev, "failed to enable host clk\n"); + goto err; + } ret = sdhci_add_host(host); if (ret) - goto err; + goto err_clk; return 0; +err_clk: + clk_disable_unprepare(pltfm_host->clk); err: sdhci_pltfm_free(pdev); return ret; |