From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/9] crypto: ux500/cryp - Prepare clock before enabling it
Date: Thu, 18 Apr 2013 11:27:00 +0100 [thread overview]
Message-ID: <1366280825-31136-5-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1366280825-31136-1-git-send-email-lee.jones@linaro.org>
If we fail to prepare the ux500-cryp clock before enabling it the
platform will fail to boot. Here we insure this happens.
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: David S. Miller <davem@davemloft.net>
Cc: Andreas Westin <andreas.westin@stericsson.com>
Cc: linux-crypto at vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/crypto/ux500/cryp/cryp_core.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c
index 8bc5fef..a56cbc4 100644
--- a/drivers/crypto/ux500/cryp/cryp_core.c
+++ b/drivers/crypto/ux500/cryp/cryp_core.c
@@ -670,7 +670,7 @@ static int cryp_disable_power(struct device *dev,
}
spin_unlock(&device_data->ctx_lock);
- clk_disable(device_data->clk);
+ clk_disable_unprepare(device_data->clk);
ret = regulator_disable(device_data->pwr_regulator);
if (ret)
dev_err(dev, "[%s]: "
@@ -703,9 +703,9 @@ static int cryp_enable_power(
goto out;
}
- ret = clk_enable(device_data->clk);
+ ret = clk_prepare_enable(device_data->clk);
if (ret) {
- dev_err(dev, "[%s]: clk_enable() failed!",
+ dev_err(dev, "[%s]: clk_prepare_enable() failed!",
__func__);
regulator_disable(device_data->pwr_regulator);
goto out;
--
1.7.10.4
next prev parent reply other threads:[~2013-04-18 10:27 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-18 10:26 [PATCH 0/9] Fix ux500 crypto drivers and init DMA in the correct way Lee Jones
2013-04-18 10:26 ` [PATCH 1/9] crypto: ux500/hash - Prepare clock before enabling it Lee Jones
2013-04-19 12:24 ` [PATCH 1/9 v2] " Lee Jones
2013-04-19 12:26 ` Arnd Bergmann
2013-04-25 11:49 ` Linus Walleij
2013-04-25 13:46 ` Lee Jones
2013-04-18 10:26 ` [PATCH 2/9] crypto: ux500/hash - Set DMA configuration though dma_slave_config() Lee Jones
2013-04-25 11:55 ` Linus Walleij
2013-04-18 10:26 ` [PATCH 3/9] ARM: ux500: Stop passing Hash DMA channel config information though pdata Lee Jones
2013-04-25 11:56 ` Linus Walleij
2013-04-18 10:27 ` Lee Jones [this message]
2013-04-19 12:22 ` [PATCH 4/9 v2] crypto: ux500/cryp - Prepare clock before enabling it Lee Jones
2013-04-19 12:23 ` Arnd Bergmann
2013-04-25 11:57 ` Linus Walleij
2013-04-18 10:27 ` [PATCH 5/9] crypto: ux500/cryp - Fix compile error Lee Jones
2013-04-25 12:00 ` Linus Walleij
2013-04-25 13:44 ` Lee Jones
2013-04-18 10:27 ` [PATCH 6/9] crypto: ux500/cryp - Set DMA configuration though dma_slave_config() Lee Jones
2013-04-25 12:02 ` Linus Walleij
2013-04-25 13:44 ` Lee Jones
2013-04-25 14:05 ` Linus Walleij
2013-04-25 14:11 ` Arnd Bergmann
2013-04-26 8:28 ` Linus Walleij
2013-04-26 8:16 ` Vinod Koul
2013-04-26 9:07 ` Linus Walleij
2013-04-26 9:39 ` Arnd Bergmann
2013-04-26 9:44 ` Russell King - ARM Linux
2013-04-26 9:41 ` Russell King - ARM Linux
2013-04-30 10:08 ` Vinod Koul
2013-04-26 9:34 ` Arnd Bergmann
2013-04-18 10:27 ` [PATCH 7/9] ARM: ux500: Stop passing Cryp DMA channel config information though pdata Lee Jones
2013-04-25 12:02 ` Linus Walleij
2013-04-18 10:27 ` [PATCH 8/9] crypto: ux500/[cryp|hash] - Show successful start-up in the bootlog Lee Jones
2013-04-25 12:03 ` Linus Walleij
2013-04-18 10:27 ` [PATCH 9/9] ARM: ux500: Register Cyrp and Hash platform drivers on Snowball Lee Jones
2013-04-25 12:04 ` Linus Walleij
2013-04-18 10:44 ` [PATCH 0/9] Fix ux500 crypto drivers and init DMA in the correct way Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1366280825-31136-5-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).