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>
This commit is contained in:
Eric Anholt 2015-05-29 14:06:12 -07:00 committed by Ulf Hansson
parent 475c9e43bf
commit 1e5a0a9a58

View file

@ -172,12 +172,19 @@ static int bcm2835_sdhci_probe(struct platform_device *pdev)
ret = PTR_ERR(pltfm_host->clk); ret = PTR_ERR(pltfm_host->clk);
goto err; 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); ret = sdhci_add_host(host);
if (ret) if (ret)
goto err; goto err_clk;
return 0; return 0;
err_clk:
clk_disable_unprepare(pltfm_host->clk);
err: err:
sdhci_pltfm_free(pdev); sdhci_pltfm_free(pdev);
return ret; return ret;