diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2012-02-09 16:57:15 -0500 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2012-03-27 12:20:18 -0400 |
| commit | 996bc8aebd2cd5b6d4c5d85085f171fa2447f364 (patch) | |
| tree | df1464e2deb54640669fdc5c449f4f0743c2888b | |
| parent | 5bd99c375e141b8dd12e18c45617158f98920e57 (diff) | |
mmc: sh_mobile_sdhi: do not manage PM clocks manually
On sh-mobile platforms the MMC clock frequency for the TMIO MMC unit is
obtained from the same clock, as the one, that runtime power-manages the
controller. The SDHI glue code has to access that clock directly,
bypassing the runtime PM framework, to get its frequency, but it
shouldn't enable or disable it.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
| -rw-r--r-- | drivers/mmc/host/sh_mobile_sdhi.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c index cb279b4e501b..f91c3aa40d1d 100644 --- a/drivers/mmc/host/sh_mobile_sdhi.c +++ b/drivers/mmc/host/sh_mobile_sdhi.c | |||
| @@ -117,8 +117,6 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev) | |||
| 117 | goto eclkget; | 117 | goto eclkget; |
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | clk_enable(priv->clk); | ||
| 121 | |||
| 122 | mmc_data->hclk = clk_get_rate(priv->clk); | 120 | mmc_data->hclk = clk_get_rate(priv->clk); |
| 123 | mmc_data->set_pwr = sh_mobile_sdhi_set_pwr; | 121 | mmc_data->set_pwr = sh_mobile_sdhi_set_pwr; |
| 124 | mmc_data->get_cd = sh_mobile_sdhi_get_cd; | 122 | mmc_data->get_cd = sh_mobile_sdhi_get_cd; |
| @@ -233,7 +231,6 @@ eirq_sdio: | |||
| 233 | eirq_card_detect: | 231 | eirq_card_detect: |
| 234 | tmio_mmc_host_remove(host); | 232 | tmio_mmc_host_remove(host); |
| 235 | eprobe: | 233 | eprobe: |
| 236 | clk_disable(priv->clk); | ||
| 237 | clk_put(priv->clk); | 234 | clk_put(priv->clk); |
| 238 | eclkget: | 235 | eclkget: |
| 239 | kfree(priv); | 236 | kfree(priv); |
| @@ -259,7 +256,6 @@ static int sh_mobile_sdhi_remove(struct platform_device *pdev) | |||
| 259 | free_irq(irq, host); | 256 | free_irq(irq, host); |
| 260 | } | 257 | } |
| 261 | 258 | ||
| 262 | clk_disable(priv->clk); | ||
| 263 | clk_put(priv->clk); | 259 | clk_put(priv->clk); |
| 264 | kfree(priv); | 260 | kfree(priv); |
| 265 | 261 | ||
