Commit 8fa23a29 authored by Ryder Lee's avatar Ryder Lee Committed by Herbert Xu
Browse files

crypto: mediatek - remove redundant clock setting 



This patch removes redundant clock setting for 'clk_ethif', which is
the parent of 'clk_cryp'. Hence, we just need to handle its child.

Signed-off-by: default avatarRyder Lee <ryder.lee@mediatek.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 47d3fd39

drivers/crypto/mediatek/mtk-platform.c

+1 −9
Original line number Original line Diff line number Diff line
@@ -504,19 +504,14 @@ static int mtk_crypto_probe(struct platform_device *pdev) 
		}

		}

	}

	}





	cryp->clk_ethif = devm_clk_get(&pdev->dev, "ethif");

	cryp->clk_cryp = devm_clk_get(&pdev->dev, "cryp");

	cryp->clk_cryp = devm_clk_get(&pdev->dev, "cryp");

	if (IS_ERR(cryp->clk_ethif) || IS_ERR(cryp->clk_cryp))

	if (IS_ERR(cryp->clk_cryp))

		return -EPROBE_DEFER;

		return -EPROBE_DEFER;





	cryp->dev = &pdev->dev;

	cryp->dev = &pdev->dev;

	pm_runtime_enable(cryp->dev);

	pm_runtime_enable(cryp->dev);

	pm_runtime_get_sync(cryp->dev);

	pm_runtime_get_sync(cryp->dev);





	err = clk_prepare_enable(cryp->clk_ethif);

	if (err)

		goto err_clk_ethif;



	err = clk_prepare_enable(cryp->clk_cryp);

	err = clk_prepare_enable(cryp->clk_cryp);

	if (err)

	if (err)

		goto err_clk_cryp;

		goto err_clk_cryp;
@@ -559,8 +554,6 @@ static int mtk_crypto_probe(struct platform_device *pdev) 
err_resource:

err_resource:

	clk_disable_unprepare(cryp->clk_cryp);

	clk_disable_unprepare(cryp->clk_cryp);

err_clk_cryp:

err_clk_cryp:

	clk_disable_unprepare(cryp->clk_ethif);

err_clk_ethif:

	pm_runtime_put_sync(cryp->dev);

	pm_runtime_put_sync(cryp->dev);

	pm_runtime_disable(cryp->dev);

	pm_runtime_disable(cryp->dev);
@@ -576,7 +569,6 @@ static int mtk_crypto_remove(struct platform_device *pdev) 
	mtk_desc_dma_free(cryp);

	mtk_desc_dma_free(cryp);





	clk_disable_unprepare(cryp->clk_cryp);

	clk_disable_unprepare(cryp->clk_cryp);

	clk_disable_unprepare(cryp->clk_ethif);





	pm_runtime_put_sync(cryp->dev);

	pm_runtime_put_sync(cryp->dev);

	pm_runtime_disable(cryp->dev);

	pm_runtime_disable(cryp->dev);

drivers/crypto/mediatek/mtk-platform.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -200,7 +200,6 @@ struct mtk_sha_rec { 
 * struct mtk_cryp - Cryptographic device

 * struct mtk_cryp - Cryptographic device

 * @base:	pointer to mapped register I/O base

 * @base:	pointer to mapped register I/O base

 * @dev:	pointer to device

 * @dev:	pointer to device

 * @clk_ethif:	pointer to ethif clock

 * @clk_cryp:	pointer to crypto clock

 * @clk_cryp:	pointer to crypto clock

 * @irq:	global system and rings IRQ

 * @irq:	global system and rings IRQ

 * @ring:	pointer to descriptor rings

 * @ring:	pointer to descriptor rings
@@ -215,7 +214,6 @@ struct mtk_sha_rec { 
struct mtk_cryp {

struct mtk_cryp {

	void __iomem *base;

	void __iomem *base;

	struct device *dev;

	struct device *dev;

	struct clk *clk_ethif;

	struct clk *clk_cryp;

	struct clk *clk_cryp;

	int irq[MTK_IRQ_NUM];

	int irq[MTK_IRQ_NUM];