From: Corentin Labbe <clabbe@baylibre.com>
To: heiko@sntech.de, ardb@kernel.org, davem@davemloft.net,
herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org,
mturquette@baylibre.com, robh+dt@kernel.org, sboyd@kernel.org
Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
linux-clk@vger.kernel.org, linux-crypto@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org,
Corentin Labbe <clabbe@baylibre.com>,
John Keeping <john@metanate.com>
Subject: [PATCH v10 15/33] crypto: rockchip: use clk_bulk to simplify clock management
Date: Tue, 27 Sep 2022 07:54:53 +0000 [thread overview]
Message-ID: <20220927075511.3147847-16-clabbe@baylibre.com> (raw)
In-Reply-To: <20220927075511.3147847-1-clabbe@baylibre.com>
rk3328 does not have the same clock names than rk3288, instead of using a complex
clock management, let's use clk_bulk to simplify their handling.
Reviewed-by: John Keeping <john@metanate.com>
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
---
drivers/crypto/rockchip/rk3288_crypto.c | 66 ++++---------------------
drivers/crypto/rockchip/rk3288_crypto.h | 6 +--
2 files changed, 11 insertions(+), 61 deletions(-)
diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockchip/rk3288_crypto.c
index 399829ef92e0..a635029ac71d 100644
--- a/drivers/crypto/rockchip/rk3288_crypto.c
+++ b/drivers/crypto/rockchip/rk3288_crypto.c
@@ -22,47 +22,16 @@ static int rk_crypto_enable_clk(struct rk_crypto_info *dev)
{
int err;
- err = clk_prepare_enable(dev->sclk);
- if (err) {
- dev_err(dev->dev, "[%s:%d], Couldn't enable clock sclk\n",
- __func__, __LINE__);
- goto err_return;
- }
- err = clk_prepare_enable(dev->aclk);
- if (err) {
- dev_err(dev->dev, "[%s:%d], Couldn't enable clock aclk\n",
- __func__, __LINE__);
- goto err_aclk;
- }
- err = clk_prepare_enable(dev->hclk);
- if (err) {
- dev_err(dev->dev, "[%s:%d], Couldn't enable clock hclk\n",
- __func__, __LINE__);
- goto err_hclk;
- }
- err = clk_prepare_enable(dev->dmaclk);
- if (err) {
- dev_err(dev->dev, "[%s:%d], Couldn't enable clock dmaclk\n",
- __func__, __LINE__);
- goto err_dmaclk;
- }
- return err;
-err_dmaclk:
- clk_disable_unprepare(dev->hclk);
-err_hclk:
- clk_disable_unprepare(dev->aclk);
-err_aclk:
- clk_disable_unprepare(dev->sclk);
-err_return:
+ err = clk_bulk_prepare_enable(dev->num_clks, dev->clks);
+ if (err)
+ dev_err(dev->dev, "Could not enable clock clks\n");
+
return err;
}
static void rk_crypto_disable_clk(struct rk_crypto_info *dev)
{
- clk_disable_unprepare(dev->dmaclk);
- clk_disable_unprepare(dev->hclk);
- clk_disable_unprepare(dev->aclk);
- clk_disable_unprepare(dev->sclk);
+ clk_bulk_disable_unprepare(dev->num_clks, dev->clks);
}
/*
@@ -266,27 +235,10 @@ static int rk_crypto_probe(struct platform_device *pdev)
goto err_crypto;
}
- crypto_info->aclk = devm_clk_get(&pdev->dev, "aclk");
- if (IS_ERR(crypto_info->aclk)) {
- err = PTR_ERR(crypto_info->aclk);
- goto err_crypto;
- }
-
- crypto_info->hclk = devm_clk_get(&pdev->dev, "hclk");
- if (IS_ERR(crypto_info->hclk)) {
- err = PTR_ERR(crypto_info->hclk);
- goto err_crypto;
- }
-
- crypto_info->sclk = devm_clk_get(&pdev->dev, "sclk");
- if (IS_ERR(crypto_info->sclk)) {
- err = PTR_ERR(crypto_info->sclk);
- goto err_crypto;
- }
-
- crypto_info->dmaclk = devm_clk_get(&pdev->dev, "apb_pclk");
- if (IS_ERR(crypto_info->dmaclk)) {
- err = PTR_ERR(crypto_info->dmaclk);
+ crypto_info->num_clks = devm_clk_bulk_get_all(&pdev->dev,
+ &crypto_info->clks);
+ if (crypto_info->num_clks < 3) {
+ err = -EINVAL;
goto err_crypto;
}
diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockchip/rk3288_crypto.h
index ddbb9246ce16..28bf09fe1c1d 100644
--- a/drivers/crypto/rockchip/rk3288_crypto.h
+++ b/drivers/crypto/rockchip/rk3288_crypto.h
@@ -190,10 +190,8 @@
struct rk_crypto_info {
struct device *dev;
- struct clk *aclk;
- struct clk *hclk;
- struct clk *sclk;
- struct clk *dmaclk;
+ struct clk_bulk_data *clks;
+ int num_clks;
struct reset_control *rst;
void __iomem *reg;
int irq;
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-09-27 8:01 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-27 7:54 [PATCH v10 00/33] crypto: rockchip: permit to pass self-tests Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 01/33] crypto: rockchip: use dev_err for error message about interrupt Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 02/33] crypto: rockchip: do not use uninitialized variable Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 03/33] crypto: rockchip: do not do custom power management Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 04/33] crypto: rockchip: fix privete/private typo Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 05/33] crypto: rockchip: do not store mode globally Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 06/33] crypto: rockchip: add fallback for cipher Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 07/33] crypto: rockchip: add fallback for ahash Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 08/33] crypto: rockchip: better handle cipher key Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 09/33] crypto: rockchip: remove non-aligned handling Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 10/33] crypto: rockchip: rework by using crypto_engine Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 11/33] crypto: rockchip: rewrite type Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 12/33] crypto: rockchip: add debugfs Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 13/33] crypto: rockchip: introduce PM Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 14/33] crypto: rockchip: handle reset also in PM Corentin Labbe
2022-09-27 7:54 ` Corentin Labbe [this message]
2022-09-27 7:54 ` [PATCH v10 16/33] crypto: rockchip: add myself as maintainer Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 17/33] crypto: rockchip: use read_poll_timeout Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 18/33] crypto: rockchip: fix style issue Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 19/33] crypto: rockchip: add support for rk3328 Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 20/33] crypto: rockchip: rename ablk functions to cipher Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 21/33] crypto: rockchip: rework rk_handle_req function Corentin Labbe
2022-09-27 7:55 ` [PATCH v10 22/33] crypto: rockchip: use a rk_crypto_info variable instead of lot of indirection Corentin Labbe
2022-09-27 7:55 ` [PATCH v10 23/33] crypto: rockchip: use the rk_crypto_info given as parameter Corentin Labbe
2022-09-27 7:55 ` [PATCH v10 24/33] dt-bindings: crypto: convert rockchip-crypto to YAML Corentin Labbe
2022-09-27 7:55 ` [PATCH v10 25/33] dt-bindings: crypto: rockchip: add new compatible Corentin Labbe
2022-09-29 22:14 ` Rob Herring
2022-09-27 7:55 ` [PATCH v10 26/33] clk: rk3399: use proper crypto0 name Corentin Labbe
2022-09-28 18:58 ` Stephen Boyd
2022-09-27 7:55 ` [PATCH v10 27/33] arm64: dts: rockchip: add rk3328 crypto node Corentin Labbe
2022-09-27 7:55 ` [PATCH v10 28/33] arm64: dts: rockchip: rk3399: add " Corentin Labbe
2022-12-11 15:51 ` Rob Herring
2022-12-12 12:44 ` Corentin LABBE
2022-09-27 7:55 ` [PATCH v10 29/33] crypto: rockchip: store crypto_info in request context Corentin Labbe
2022-09-27 7:55 ` [PATCH v10 30/33] crypto: rockchip: Check for clocks numbers and their frequencies Corentin Labbe
2022-09-27 7:55 ` [PATCH v10 31/33] crypto: rockchip: rk_ahash_reg_init use crypto_info from parameter Corentin Labbe
2022-09-27 7:55 ` [PATCH v10 32/33] crypto: rockchip: permit to have more than one reset Corentin Labbe
2022-09-27 7:55 ` [PATCH v10 33/33] crypto: rockchip: Add support for RK3399 Corentin Labbe
2022-10-21 13:20 ` [PATCH v10 00/33] crypto: rockchip: permit to pass self-tests Corentin LABBE
2022-10-21 17:09 ` Heiko Stübner
2022-10-26 7:41 ` Corentin LABBE
2022-10-26 10:05 ` Herbert Xu
2022-10-26 10:25 ` Heiko Stübner
2022-10-28 2:06 ` Krzysztof Kozlowski
2022-10-28 5:01 ` Herbert Xu
2022-10-29 8:12 ` (subset) " Heiko Stuebner
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=20220927075511.3147847-16-clabbe@baylibre.com \
--to=clabbe@baylibre.com \
--cc=ardb@kernel.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=herbert@gondor.apana.org.au \
--cc=john@metanate.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mturquette@baylibre.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.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).