redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

mmc: sdhci-spear: Add clk_{un}prepare() support 

clk_{un}prepare is mandatory for platforms using common clock framework.
Since this driver is used by SPEAr platform, which supports common clock
framework, add clk_{un}prepare() support for it.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
hifive-unleashed-5.1
Viresh Kumar 2012-09-28 15:58:23 +05:30 committed by Chris Ball
parent 067bf748bd
commit da764f97df
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/devicetree/bindings/mmc/sdhci-spear.txt
View File

@ -9,13 +9,10 @@ Required properties:
Optional properties:
- cd-gpios: card detect gpio, with zero flags.
If your board don't support these gpios then don't pass the entry.
Example:
sdhci@fc000000 {
compatible = "st,spear300-sdhci";
reg = <0xfc000000 0x1000>;
cd-gpios = <&gpio0 6 0>
cd-gpios = <&gpio0 6 0>;
};

10
drivers/mmc/host/sdhci-spear.c
View File

@ -140,7 +140,7 @@ static int __devinit sdhci_probe(struct platform_device *pdev)
goto err;
}
ret = clk_enable(sdhci->clk);
ret = clk_prepare_enable(sdhci->clk);
if (ret) {
dev_dbg(&pdev->dev, "Error enabling clock\n");
goto put_clk;
@ -260,7 +260,7 @@ set_drvdata:
free_host:
sdhci_free_host(host);
disable_clk:
clk_disable(sdhci->clk);
clk_disable_unprepare(sdhci->clk);
put_clk:
clk_put(sdhci->clk);
err:
@ -282,7 +282,7 @@ static int __devexit sdhci_remove(struct platform_device *pdev)
sdhci_remove_host(host, dead);
sdhci_free_host(host);
clk_disable(sdhci->clk);
clk_disable_unprepare(sdhci->clk);
clk_put(sdhci->clk);
return 0;
@ -297,7 +297,7 @@ static int sdhci_suspend(struct device *dev)
ret = sdhci_suspend_host(host);
if (!ret)
clk_disable(sdhci->clk);
clk_disable_unprepare(sdhci->clk);
return ret;
}
@ -308,7 +308,7 @@ static int sdhci_resume(struct device *dev)
struct spear_sdhci *sdhci = dev_get_platdata(dev);
int ret;
ret = clk_enable(sdhci->clk);
ret = clk_prepare_enable(sdhci->clk);
if (ret) {
dev_dbg(dev, "Resume: Error enabling clock\n");
return ret;