diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2014-12-03 18:37:10 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-12-05 16:30:26 +0000 |
| commit | 0821c3bc5df805aef1f5989b7a7dacc2491a0e5b (patch) | |
| tree | 492358fbec814691376470d201ce75c0de5b54fa /drivers/pcmcia | |
| parent | 23834a4116cd468d62e1092234e46ec1919a9e86 (diff) | |
| download | linux-stable-0821c3bc5df805aef1f5989b7a7dacc2491a0e5b.tar.gz linux-stable-0821c3bc5df805aef1f5989b7a7dacc2491a0e5b.tar.bz2 linux-stable-0821c3bc5df805aef1f5989b7a7dacc2491a0e5b.zip | |
ARM: 8245/1: pcmcia: soc-common: enable/disable socket clocks
Call clk_prepare_enable() during hw_init() and clk_disable_unprepare()
during hw_shutdown() to ensure that the clock rates returned by
clk_get_rate() are correct.
It is safe to call enable/disable functions even on NULL clock, so this
patch will not break cases when the socket clock is not set.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/soc_common.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index a2bc6ee1702e..933f4657515b 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c @@ -120,6 +120,8 @@ static void __soc_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt, if (skt->ops->hw_shutdown) skt->ops->hw_shutdown(skt); + + clk_disable_unprepare(skt->clk); } static void soc_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt) @@ -131,6 +133,8 @@ static int soc_pcmcia_hw_init(struct soc_pcmcia_socket *skt) { int ret = 0, i; + clk_prepare_enable(skt->clk); + if (skt->ops->hw_init) { ret = skt->ops->hw_init(skt); if (ret) |