[PATCH v4 2/4] crypto: caam - do not use mem and emi_slow clock for imx7x

[Rui Miguel Silva]

I.MX7x only use two clocks for the CAAM module, so make sure we do not try to
use the mem and the emi_slow clock when running in that imx7d and imx7s machine
type.

Cc: "Horia Geantă" 
Cc: Aymen Sghaier 
Cc: Fabio Estevam 
Cc: Peng Fan 
Cc: "David S. Miller" 
Cc: Lukas Auer 
Signed-off-by: Rui Miguel Silva 
---
 drivers/crypto/caam/ctrl.c | 39 ---
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 361e750f9cba..e4cc636e1104 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -337,7 +337,8 @@ static int caam_remove(struct platform_device *pdev)
 
/* shut clocks off before finalizing shutdown */
clk_disable_unprepare(ctrlpriv->caam_ipg);
-   clk_disable_unprepare(ctrlpriv->caam_mem);
+   if (ctrlpriv->caam_mem)
+   clk_disable_unprepare(ctrlpriv->caam_mem);
clk_disable_unprepare(ctrlpriv->caam_aclk);
if (ctrlpriv->caam_emi_slow)
clk_disable_unprepare(ctrlpriv->caam_emi_slow);
@@ -466,14 +467,17 @@ static int caam_probe(struct platform_device *pdev)
}
ctrlpriv->caam_ipg = clk;
 
-   clk = caam_drv_identify_clk(>dev, "mem");
-   if (IS_ERR(clk)) {
-   ret = PTR_ERR(clk);
-   dev_err(>dev,
-   "can't identify CAAM mem clk: %d\n", ret);
-   return ret;
+   if (!of_machine_is_compatible("fsl,imx7d") &&
+   !of_machine_is_compatible("fsl,imx7s")) {
+   clk = caam_drv_identify_clk(>dev, "mem");
+   if (IS_ERR(clk)) {
+   ret = PTR_ERR(clk);
+   dev_err(>dev,
+   "can't identify CAAM mem clk: %d\n", ret);
+   return ret;
+   }
+   ctrlpriv->caam_mem = clk;
}
-   ctrlpriv->caam_mem = clk;
 
clk = caam_drv_identify_clk(>dev, "aclk");
if (IS_ERR(clk)) {
@@ -484,7 +488,9 @@ static int caam_probe(struct platform_device *pdev)
}
ctrlpriv->caam_aclk = clk;
 
-   if (!of_machine_is_compatible("fsl,imx6ul")) {
+   if (!of_machine_is_compatible("fsl,imx6ul") &&
+   !of_machine_is_compatible("fsl,imx7d") &&
+   !of_machine_is_compatible("fsl,imx7s")) {
clk = caam_drv_identify_clk(>dev, "emi_slow");
if (IS_ERR(clk)) {
ret = PTR_ERR(clk);
@@ -501,11 +507,13 @@ static int caam_probe(struct platform_device *pdev)
return ret;
}
 
-   ret = clk_prepare_enable(ctrlpriv->caam_mem);
-   if (ret < 0) {
-   dev_err(>dev, "can't enable CAAM secure mem clock: %d\n",
-   ret);
-   goto disable_caam_ipg;
+   if (ctrlpriv->caam_mem) {
+   ret = clk_prepare_enable(ctrlpriv->caam_mem);
+   if (ret < 0) {
+   dev_err(>dev, "can't enable CAAM secure mem 
clock: %d\n",
+   ret);
+   goto disable_caam_ipg;
+   }
}
 
ret = clk_prepare_enable(ctrlpriv->caam_aclk);
@@ -826,7 +834,8 @@ static int caam_probe(struct platform_device *pdev)
 disable_caam_aclk:
clk_disable_unprepare(ctrlpriv->caam_aclk);
 disable_caam_mem:
-   clk_disable_unprepare(ctrlpriv->caam_mem);
+   if (ctrlpriv->caam_mem)
+   clk_disable_unprepare(ctrlpriv->caam_mem);
 disable_caam_ipg:
clk_disable_unprepare(ctrlpriv->caam_ipg);
return ret;
-- 
2.16.2

[PATCH v4 2/4] crypto: caam - do not use mem and emi_slow clock for imx7x

[Rui Miguel Silva]

I.MX7x only use two clocks for the CAAM module, so make sure we do not try to
use the mem and the emi_slow clock when running in that imx7d and imx7s machine
type.

Cc: "Horia Geantă" 
Cc: Aymen Sghaier 
Cc: Fabio Estevam 
Cc: Peng Fan 
Cc: "David S. Miller" 
Cc: Lukas Auer 
Signed-off-by: Rui Miguel Silva 
---
 drivers/crypto/caam/ctrl.c | 39 ---
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 361e750f9cba..e4cc636e1104 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -337,7 +337,8 @@ static int caam_remove(struct platform_device *pdev)
 
/* shut clocks off before finalizing shutdown */
clk_disable_unprepare(ctrlpriv->caam_ipg);
-   clk_disable_unprepare(ctrlpriv->caam_mem);
+   if (ctrlpriv->caam_mem)
+   clk_disable_unprepare(ctrlpriv->caam_mem);
clk_disable_unprepare(ctrlpriv->caam_aclk);
if (ctrlpriv->caam_emi_slow)
clk_disable_unprepare(ctrlpriv->caam_emi_slow);
@@ -466,14 +467,17 @@ static int caam_probe(struct platform_device *pdev)
}
ctrlpriv->caam_ipg = clk;
 
-   clk = caam_drv_identify_clk(>dev, "mem");
-   if (IS_ERR(clk)) {
-   ret = PTR_ERR(clk);
-   dev_err(>dev,
-   "can't identify CAAM mem clk: %d\n", ret);
-   return ret;
+   if (!of_machine_is_compatible("fsl,imx7d") &&
+   !of_machine_is_compatible("fsl,imx7s")) {
+   clk = caam_drv_identify_clk(>dev, "mem");
+   if (IS_ERR(clk)) {
+   ret = PTR_ERR(clk);
+   dev_err(>dev,
+   "can't identify CAAM mem clk: %d\n", ret);
+   return ret;
+   }
+   ctrlpriv->caam_mem = clk;
}
-   ctrlpriv->caam_mem = clk;
 
clk = caam_drv_identify_clk(>dev, "aclk");
if (IS_ERR(clk)) {
@@ -484,7 +488,9 @@ static int caam_probe(struct platform_device *pdev)
}
ctrlpriv->caam_aclk = clk;
 
-   if (!of_machine_is_compatible("fsl,imx6ul")) {
+   if (!of_machine_is_compatible("fsl,imx6ul") &&
+   !of_machine_is_compatible("fsl,imx7d") &&
+   !of_machine_is_compatible("fsl,imx7s")) {
clk = caam_drv_identify_clk(>dev, "emi_slow");
if (IS_ERR(clk)) {
ret = PTR_ERR(clk);
@@ -501,11 +507,13 @@ static int caam_probe(struct platform_device *pdev)
return ret;
}
 
-   ret = clk_prepare_enable(ctrlpriv->caam_mem);
-   if (ret < 0) {
-   dev_err(>dev, "can't enable CAAM secure mem clock: %d\n",
-   ret);
-   goto disable_caam_ipg;
+   if (ctrlpriv->caam_mem) {
+   ret = clk_prepare_enable(ctrlpriv->caam_mem);
+   if (ret < 0) {
+   dev_err(>dev, "can't enable CAAM secure mem 
clock: %d\n",
+   ret);
+   goto disable_caam_ipg;
+   }
}
 
ret = clk_prepare_enable(ctrlpriv->caam_aclk);
@@ -826,7 +834,8 @@ static int caam_probe(struct platform_device *pdev)
 disable_caam_aclk:
clk_disable_unprepare(ctrlpriv->caam_aclk);
 disable_caam_mem:
-   clk_disable_unprepare(ctrlpriv->caam_mem);
+   if (ctrlpriv->caam_mem)
+   clk_disable_unprepare(ctrlpriv->caam_mem);
 disable_caam_ipg:
clk_disable_unprepare(ctrlpriv->caam_ipg);
return ret;
-- 
2.16.2