All of lore.kernel.org
 help / color / mirror / Atom feed
From: Corentin Labbe <clabbe@baylibre.com>
To: heiko@sntech.de, herbert@gondor.apana.org.au,
	krzysztof.kozlowski@canonical.com, robh+dt@kernel.org
Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-rockchip@lists.infradead.org,
	Corentin Labbe <clabbe@baylibre.com>
Subject: [PATCH 11/16] crypto: rockhip: do not handle dma clock
Date: Mon, 28 Feb 2022 19:40:32 +0000	[thread overview]
Message-ID: <20220228194037.1600509-12-clabbe@baylibre.com> (raw)
In-Reply-To: <20220228194037.1600509-1-clabbe@baylibre.com>

The DMA clock is handled by the DMA controller, so the crypto does not
have to touch it.

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
---
 drivers/crypto/rockchip/rk3288_crypto.c | 16 +---------------
 drivers/crypto/rockchip/rk3288_crypto.h |  1 -
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockchip/rk3288_crypto.c
index 94ef1283789f..645855d2651b 100644
--- a/drivers/crypto/rockchip/rk3288_crypto.c
+++ b/drivers/crypto/rockchip/rk3288_crypto.c
@@ -40,15 +40,8 @@ static int rk_crypto_enable_clk(struct rk_crypto_info *dev)
 			__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:
@@ -59,7 +52,6 @@ static int rk_crypto_enable_clk(struct rk_crypto_info *dev)
 
 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);
@@ -199,12 +191,6 @@ static int rk_crypto_probe(struct platform_device *pdev)
 		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);
-		goto err_crypto;
-	}
-
 	crypto_info->irq = platform_get_irq(pdev, 0);
 	if (crypto_info->irq < 0) {
 		dev_err(&pdev->dev, "control Interrupt is not available.\n");
diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockchip/rk3288_crypto.h
index c741e97057dc..963fbfc4d14e 100644
--- a/drivers/crypto/rockchip/rk3288_crypto.h
+++ b/drivers/crypto/rockchip/rk3288_crypto.h
@@ -191,7 +191,6 @@ struct rk_crypto_info {
 	struct clk			*aclk;
 	struct clk			*hclk;
 	struct clk			*sclk;
-	struct clk			*dmaclk;
 	struct reset_control		*rst;
 	void __iomem			*reg;
 	int				irq;
-- 
2.34.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
From: Corentin Labbe <clabbe@baylibre.com>
To: heiko@sntech.de, herbert@gondor.apana.org.au,
	krzysztof.kozlowski@canonical.com, robh+dt@kernel.org
Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-rockchip@lists.infradead.org,
	Corentin Labbe <clabbe@baylibre.com>
Subject: [PATCH 11/16] crypto: rockhip: do not handle dma clock
Date: Mon, 28 Feb 2022 19:40:32 +0000	[thread overview]
Message-ID: <20220228194037.1600509-12-clabbe@baylibre.com> (raw)
In-Reply-To: <20220228194037.1600509-1-clabbe@baylibre.com>

The DMA clock is handled by the DMA controller, so the crypto does not
have to touch it.

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
---
 drivers/crypto/rockchip/rk3288_crypto.c | 16 +---------------
 drivers/crypto/rockchip/rk3288_crypto.h |  1 -
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockchip/rk3288_crypto.c
index 94ef1283789f..645855d2651b 100644
--- a/drivers/crypto/rockchip/rk3288_crypto.c
+++ b/drivers/crypto/rockchip/rk3288_crypto.c
@@ -40,15 +40,8 @@ static int rk_crypto_enable_clk(struct rk_crypto_info *dev)
 			__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:
@@ -59,7 +52,6 @@ static int rk_crypto_enable_clk(struct rk_crypto_info *dev)
 
 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);
@@ -199,12 +191,6 @@ static int rk_crypto_probe(struct platform_device *pdev)
 		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);
-		goto err_crypto;
-	}
-
 	crypto_info->irq = platform_get_irq(pdev, 0);
 	if (crypto_info->irq < 0) {
 		dev_err(&pdev->dev, "control Interrupt is not available.\n");
diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockchip/rk3288_crypto.h
index c741e97057dc..963fbfc4d14e 100644
--- a/drivers/crypto/rockchip/rk3288_crypto.h
+++ b/drivers/crypto/rockchip/rk3288_crypto.h
@@ -191,7 +191,6 @@ struct rk_crypto_info {
 	struct clk			*aclk;
 	struct clk			*hclk;
 	struct clk			*sclk;
-	struct clk			*dmaclk;
 	struct reset_control		*rst;
 	void __iomem			*reg;
 	int				irq;
-- 
2.34.1


WARNING: multiple messages have this Message-ID (diff)
From: Corentin Labbe <clabbe@baylibre.com>
To: heiko@sntech.de, herbert@gondor.apana.org.au,
	krzysztof.kozlowski@canonical.com, robh+dt@kernel.org
Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-rockchip@lists.infradead.org,
	Corentin Labbe <clabbe@baylibre.com>
Subject: [PATCH 11/16] crypto: rockhip: do not handle dma clock
Date: Mon, 28 Feb 2022 19:40:32 +0000	[thread overview]
Message-ID: <20220228194037.1600509-12-clabbe@baylibre.com> (raw)
In-Reply-To: <20220228194037.1600509-1-clabbe@baylibre.com>

The DMA clock is handled by the DMA controller, so the crypto does not
have to touch it.

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
---
 drivers/crypto/rockchip/rk3288_crypto.c | 16 +---------------
 drivers/crypto/rockchip/rk3288_crypto.h |  1 -
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockchip/rk3288_crypto.c
index 94ef1283789f..645855d2651b 100644
--- a/drivers/crypto/rockchip/rk3288_crypto.c
+++ b/drivers/crypto/rockchip/rk3288_crypto.c
@@ -40,15 +40,8 @@ static int rk_crypto_enable_clk(struct rk_crypto_info *dev)
 			__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:
@@ -59,7 +52,6 @@ static int rk_crypto_enable_clk(struct rk_crypto_info *dev)
 
 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);
@@ -199,12 +191,6 @@ static int rk_crypto_probe(struct platform_device *pdev)
 		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);
-		goto err_crypto;
-	}
-
 	crypto_info->irq = platform_get_irq(pdev, 0);
 	if (crypto_info->irq < 0) {
 		dev_err(&pdev->dev, "control Interrupt is not available.\n");
diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockchip/rk3288_crypto.h
index c741e97057dc..963fbfc4d14e 100644
--- a/drivers/crypto/rockchip/rk3288_crypto.h
+++ b/drivers/crypto/rockchip/rk3288_crypto.h
@@ -191,7 +191,6 @@ struct rk_crypto_info {
 	struct clk			*aclk;
 	struct clk			*hclk;
 	struct clk			*sclk;
-	struct clk			*dmaclk;
 	struct reset_control		*rst;
 	void __iomem			*reg;
 	int				irq;
-- 
2.34.1


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

  parent reply	other threads:[~2022-02-28 19:46 UTC|newest]

Thread overview: 75+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-28 19:40 [PATCH 00/16] crypto: rockchip: permit to pass self-tests Corentin Labbe
2022-02-28 19:40 ` Corentin Labbe
2022-02-28 19:40 ` Corentin Labbe
2022-02-28 19:40 ` [PATCH 01/16] crypto: rockchip: use dev_err for error message about interrupt Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40 ` [PATCH 02/16] crypto: rockchip: do not use uninit variable Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40 ` [PATCH 03/16] crypto: rockchip: do not do custom power management Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40 ` [PATCH 04/16] crypto: rockchip: fix privete/private typo Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40 ` [PATCH 05/16] crypto: rockchip: do not store mode globally Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40 ` [PATCH 06/16] crypto: rockchip: add fallback for cipher Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40 ` [PATCH 07/16] crypto: rockchip: add fallback for ahash Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40 ` [PATCH 08/16] crypto: rockchip: better handle cipher key Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40 ` [PATCH 09/16] crypto: rockchip: remove non-aligned handling Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40 ` [PATCH 10/16] crypto: rockchip: rework by using crypto_engine Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-03-01  1:15   ` kernel test robot
2022-03-01  1:15     ` kernel test robot
2022-03-01  1:15     ` kernel test robot
2022-03-01  1:26   ` kernel test robot
2022-03-01  1:26     ` kernel test robot
2022-03-01  1:26     ` kernel test robot
2022-03-01 12:57   ` John Keeping
2022-03-01 12:57     ` John Keeping
2022-03-01 12:57     ` John Keeping
2022-03-02 21:09     ` LABBE Corentin
2022-03-02 21:09       ` LABBE Corentin
2022-03-02 21:09       ` LABBE Corentin
2022-02-28 19:40 ` Corentin Labbe [this message]
2022-02-28 19:40   ` [PATCH 11/16] crypto: rockhip: do not handle dma clock Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40 ` [PATCH 12/16] ARM: dts: rk3288: crypto do not need " Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40 ` [PATCH 13/16] crypto: rockchip: rewrite type Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-03-01  4:18   ` kernel test robot
2022-03-01  4:18     ` kernel test robot
2022-03-01  4:18     ` kernel test robot
2022-03-01  4:18   ` kernel test robot
2022-03-01  4:18     ` kernel test robot
2022-03-01  4:18     ` kernel test robot
2022-02-28 19:40 ` [PATCH 14/16] crypto: rockchip: add debugfs Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40 ` [PATCH 15/16] arm64: dts: rockchip: add rk3328 crypto node Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40 ` [PATCH 16/16] crypto: rockchip: add myself as maintainer Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-02-28 19:40   ` Corentin Labbe
2022-03-01 13:00 ` [PATCH 00/16] crypto: rockchip: permit to pass self-tests John Keeping
2022-03-01 13:00   ` John Keeping
2022-03-01 13:00   ` John Keeping
2022-03-02 21:10   ` LABBE Corentin
2022-03-02 21:10     ` LABBE Corentin
2022-03-02 21:10     ` LABBE Corentin

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=20220228194037.1600509-12-clabbe@baylibre.com \
    --to=clabbe@baylibre.com \
    --cc=devicetree@vger.kernel.org \
    --cc=heiko@sntech.de \
    --cc=herbert@gondor.apana.org.au \
    --cc=krzysztof.kozlowski@canonical.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=robh+dt@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.