Revert "mmc: sdhci-s3c: Add clk_(enable/disable) in runtime
From: Heiko Stuebner <heiko@...> Date: Wed, 7 Nov 2012 22:11:24 +0100
Commit-Message
This reverts commit 2abeb5c5ded2e7f7d288058426fb0ae852adc77f, as it breaks machines using the gpio-based card-detect option with a loop of mmc0: Timeout waiting for hardware interrupt. mmc0: Internal clock never stabilised. mmc0: Timeout waiting for hardware interrupt. mmc0: Internal clock never stabilised. Signed-off-by: Heiko Stuebner <heiko@...>
Patch-Comment
This is for 3.7-rc drivers/mmc/host/sdhci-s3c.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-)
Statistics
- 2 lines added
- 27 lines removed
Changes
------------------------- drivers/mmc/host/sdhci-s3c.c -------------------------
index 2903949..e019672 100644
@@ -637,9 +637,7 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
goto err_no_busclks;
}
clk_enable(sc->clk_bus[sc->cur_clk]);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
host->ioaddr = devm_request_and_ioremap(&pdev->dev, res);
@@ -746,15 +744,10 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
gpio_is_valid(pdata->ext_cd_gpio))
sdhci_s3c_setup_card_detect_gpio(sc);
return 0;
err_req_regs:
clk_disable(sc->clk_bus[sc->cur_clk]);
for (ptr = 0; ptr < MAX_BUS_CLK; ptr++) {
if (sc->clk_bus[ptr]) {
clk_put(sc->clk_bus[ptr]);
@@ -793,17 +786,12 @@ static int __devexit sdhci_s3c_remove(struct platform_device *pdev)
if (gpio_is_valid(sc->ext_cd_gpio))
gpio_free(sc->ext_cd_gpio);
sdhci_remove_host(host, 1);
pm_runtime_dont_use_autosuspend(&pdev->dev);
pm_runtime_disable(&pdev->dev);
clk_disable(sc->clk_bus[sc->cur_clk]);
for (ptr = 0; ptr < MAX_BUS_CLK; ptr++) {
if (sc->clk_bus[ptr]) {
clk_put(sc->clk_bus[ptr]);
@@ -843,28 +831,15 @@ static int sdhci_s3c_resume(struct device *dev)
static int sdhci_s3c_runtime_suspend(struct device *dev)
{
struct sdhci_host *host = dev_get_drvdata(dev);
+ return sdhci_runtime_suspend_host(host);
}
static int sdhci_s3c_runtime_resume(struct device *dev)
{
struct sdhci_host *host = dev_get_drvdata(dev);
+ return sdhci_runtime_resume_host(host);
}
#endif