* [PATCH] crypto: caam: check caam_emi_slow instead of re-lookup platform
@ 2016-11-28 17:53 Marcus Folkesson
0 siblings, 0 replies; only message in thread
From: Marcus Folkesson @ 2016-11-28 17:53 UTC (permalink / raw)
To: Herbert Xu, David S. Miller, Rob Herring, Mark Rutland,
Horia Geanta, Arnd Bergmann, Alex Porosanu, Srinivas Kandagatla,
Baoyou Xie, Russell King
Cc: linux-crypto, devicetree, linux-kernel
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
---
Russel King, sorry, I did not see your comment until now.
drivers/crypto/caam/ctrl.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 5abaf3743b86..4993c90ceb3f 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -329,7 +329,7 @@ static int caam_remove(struct platform_device *pdev)
clk_disable_unprepare(ctrlpriv->caam_ipg);
clk_disable_unprepare(ctrlpriv->caam_mem);
clk_disable_unprepare(ctrlpriv->caam_aclk);
- if (!of_machine_is_compatible("fsl,imx6ul"))
+ if (ctrlpriv->caam_emi_slow)
clk_disable_unprepare(ctrlpriv->caam_emi_slow);
return 0;
}
@@ -511,7 +511,7 @@ static int caam_probe(struct platform_device *pdev)
goto disable_caam_mem;
}
- if (!of_machine_is_compatible("fsl,imx6ul")) {
+ if (ctrlpriv->caam_emi_slow) {
ret = clk_prepare_enable(ctrlpriv->caam_emi_slow);
if (ret < 0) {
dev_err(&pdev->dev, "can't enable CAAM emi slow clock: %d\n",
@@ -833,7 +833,7 @@ caam_remove:
iounmap_ctrl:
iounmap(ctrl);
disable_caam_emi_slow:
- if (!of_machine_is_compatible("fsl,imx6ul"))
+ if (ctrlpriv->caam_emi_slow)
clk_disable_unprepare(ctrlpriv->caam_emi_slow);
disable_caam_aclk:
clk_disable_unprepare(ctrlpriv->caam_aclk);
--
2.11.0.rc2
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-11-28 11:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-28 17:53 [PATCH] crypto: caam: check caam_emi_slow instead of re-lookup platform Marcus Folkesson
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.