[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAPDyKFqD93K_vBKpoWmLjFHaY06seARDpxb-KJJFv4LAzXa1Vw@mail.gmail.com>
Date: Wed, 8 May 2013 15:59:08 +0200
From: Ulf Hansson <ulf.hansson@...aro.org>
To: Lee Jones <lee.jones@...aro.org>
Cc: linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
arnd@...db.de, linus.walleij@...ricsson.com,
srinidhi.kasagar@...ricsson.com,
Herbert Xu <herbert@...dor.apana.org.au>,
"David S. Miller" <davem@...emloft.net>,
Andreas Westin <andreas.westin@...ricsson.com>,
linux-crypto@...r.kernel.org
Subject: Re: [PATCH 36/63] crypto: ux500/hash - Prepare clock before enabling it
On 3 May 2013 16:32, Lee Jones <lee.jones@...aro.org> wrote:
> If we fail to prepare the ux500-hash clock before enabling it the
> platform will fail to boot. Here we insure this happens.
>
> Cc: Herbert Xu <herbert@...dor.apana.org.au>
> Cc: David S. Miller <davem@...emloft.net>
> Cc: Andreas Westin <andreas.westin@...ricsson.com>
> Cc: Ulf Hansson <ulf.hansson@...aro.org>
> Cc: linux-crypto@...r.kernel.org
> Acked-by: Arnd Bergmann <arnd@...db.de>
> Signed-off-by: Lee Jones <lee.jones@...aro.org>
> ---
> drivers/crypto/ux500/hash/hash_core.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c
> index 632c333..1e8b2f3 100644
> --- a/drivers/crypto/ux500/hash/hash_core.c
> +++ b/drivers/crypto/ux500/hash/hash_core.c
> @@ -1727,11 +1727,17 @@ static int ux500_hash_probe(struct platform_device *pdev)
> goto out_regulator;
> }
>
> + ret = clk_prepare(device_data->clk);
> + if (ret) {
> + dev_err(dev, "[%s] clk_prepare() failed!", __func__);
> + goto out_clk;
> + }
> +
> /* Enable device power (and clock) */
> ret = hash_enable_power(device_data, false);
> if (ret) {
> dev_err(dev, "[%s]: hash_enable_power() failed!", __func__);
> - goto out_clk;
> + goto out_clk_unprepare;
> }
>
> ret = hash_check_hw(device_data);
> @@ -1763,6 +1769,9 @@ static int ux500_hash_probe(struct platform_device *pdev)
> out_power:
> hash_disable_power(device_data, false);
>
> +out_clk_unprepare:
> + clk_unprepare(device_data->clk);
> +
> out_clk:
> clk_put(device_data->clk);
>
> @@ -1827,6 +1836,7 @@ static int ux500_hash_remove(struct platform_device *pdev)
> dev_err(dev, "[%s]: hash_disable_power() failed",
> __func__);
>
> + clk_unprepare(device_data->clk);
> clk_put(device_data->clk);
> regulator_put(device_data->regulator);
>
> --
> 1.7.10.4
>
Acked-by: Ulf Hansson <ulf.hansson@...aro.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists