leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: caam - check caam_emi_slow instead of re-lookup platform

Browse Source 
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Marcus Folkesson 2016-11-28 12:53:28 -05:00 committed by Herbert Xu
parent 5937d81a96
commit b80609a161
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/crypto/caam/ctrl.c
View File

@ -330,7 +330,7 @@ static int caam_remove(struct platform_device *pdev)
clk_disable_unprepare(ctrlpriv->caam_ipg); clk_disable_unprepare(ctrlpriv->caam_ipg);
clk_disable_unprepare(ctrlpriv->caam_mem); clk_disable_unprepare(ctrlpriv->caam_mem);
clk_disable_unprepare(ctrlpriv->caam_aclk); 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); clk_disable_unprepare(ctrlpriv->caam_emi_slow);
return 0; return 0;
} }
@ -506,7 +506,7 @@ static int caam_probe(struct platform_device *pdev)
goto disable_caam_mem; goto disable_caam_mem;
} }
if (!of_machine_is_compatible("fsl,imx6ul")) { if (ctrlpriv->caam_emi_slow) {
ret = clk_prepare_enable(ctrlpriv->caam_emi_slow); ret = clk_prepare_enable(ctrlpriv->caam_emi_slow);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "can't enable CAAM emi slow clock: %d\n", dev_err(&pdev->dev, "can't enable CAAM emi slow clock: %d\n",
@ -830,7 +830,7 @@ caam_remove:
iounmap_ctrl: iounmap_ctrl:
iounmap(ctrl); iounmap(ctrl);
disable_caam_emi_slow: disable_caam_emi_slow:
if (!of_machine_is_compatible("fsl,imx6ul")) if (ctrlpriv->caam_emi_slow)
clk_disable_unprepare(ctrlpriv->caam_emi_slow); clk_disable_unprepare(ctrlpriv->caam_emi_slow);
disable_caam_aclk: disable_caam_aclk:
clk_disable_unprepare(ctrlpriv->caam_aclk); clk_disable_unprepare(ctrlpriv->caam_aclk);