SSI-73: crypto: caam - support for imx8mn

CAAM support for imx8mn is based on the existing imx8 support

Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>

2 files changed, 33 insertions, 26 deletions

diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 1dd1e2b2a673..58734f2e1639 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -86,10 +86,11 @@ static int caam_remove(struct platform_device *pdev)
 	iounmap(ctrl);
 
 	/* shut clocks off before finalizing shutdown */
-	if (!of_machine_is_compatible("fsl,imx8mm") &&
-		!of_machine_is_compatible("fsl,imx8mq") &&
-		!of_machine_is_compatible("fsl,imx8qm") &&
-		!of_machine_is_compatible("fsl,imx8qxp")) {
+	if (!of_machine_is_compatible("fsl,imx8mn") &&
+	    !of_machine_is_compatible("fsl,imx8mm") &&
+	    !of_machine_is_compatible("fsl,imx8mq") &&
+	    !of_machine_is_compatible("fsl,imx8qm") &&
+	    !of_machine_is_compatible("fsl,imx8qxp")) {
 		clk_disable_unprepare(ctrlpriv->caam_ipg);
 		clk_disable_unprepare(ctrlpriv->caam_aclk);
 		if (ctrlpriv->caam_mem)
@@ -355,10 +356,11 @@ static int caam_probe(struct platform_device *pdev)
 
 	caam_imx = (bool)soc_device_match(imx_soc);
 
-	if (!of_machine_is_compatible("fsl,imx8mm") &&
-		 !of_machine_is_compatible("fsl,imx8mq") &&
-	     !of_machine_is_compatible("fsl,imx8qm") &&
-	     !of_machine_is_compatible("fsl,imx8qxp")) {
+	if (!of_machine_is_compatible("fsl,imx8mn") &&
+	    !of_machine_is_compatible("fsl,imx8mm") &&
+	    !of_machine_is_compatible("fsl,imx8mq") &&
+	    !of_machine_is_compatible("fsl,imx8qm") &&
+	    !of_machine_is_compatible("fsl,imx8qxp")) {
 		ret = init_clocks(ctrlpriv);
 		if (ret)
 			goto exit;
@@ -446,8 +448,9 @@ static int caam_probe(struct platform_device *pdev)
 		goto iounmap_ctrl;
 	}
 
-	if (!of_machine_is_compatible("fsl,imx8mm") &&
-		!of_machine_is_compatible("fsl,imx8mq") &&
+	if (!of_machine_is_compatible("fsl,imx8mn") &&
+	    !of_machine_is_compatible("fsl,imx8mm") &&
+	    !of_machine_is_compatible("fsl,imx8mq") &&
 	    !of_machine_is_compatible("fsl,imx8qm") &&
 	    !of_machine_is_compatible("fsl,imx8qxp")) {
 		ctrlpriv->sm_size = resource_size(&res_regs);
@@ -462,10 +465,11 @@ static int caam_probe(struct platform_device *pdev)
 		caam_ctrl_hw_configuration(ctrlpriv);
 
 	/* Set DMA masks according to platform ranging */
-	if (of_machine_is_compatible("fsl,imx8mm") ||
-		of_machine_is_compatible("fsl,imx8qm") ||
-		of_machine_is_compatible("fsl,imx8qxp") ||
-		of_machine_is_compatible("fsl,imx8mq")) {
+	if (of_machine_is_compatible("fsl,imx8mn") ||
+	    of_machine_is_compatible("fsl,imx8mm") ||
+	    of_machine_is_compatible("fsl,imx8qm") ||
+	    of_machine_is_compatible("fsl,imx8qxp") ||
+	    of_machine_is_compatible("fsl,imx8mq")) {
 		ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
 	} else if (sizeof(dma_addr_t) == sizeof(u64))
 		if (of_device_is_compatible(nprop, "fsl,sec-v5.0"))
@@ -516,10 +520,11 @@ caam_remove:
 iounmap_ctrl:
 	iounmap(ctrl);
 disable_clocks:
-	if (!of_machine_is_compatible("fsl,imx8mm") &&
-		!of_machine_is_compatible("fsl,imx8mq") &&
-		!of_machine_is_compatible("fsl,imx8qm") &&
-		!of_machine_is_compatible("fsl,imx8qxp")) {
+	if (!of_machine_is_compatible("fsl,imx8mn") &&
+	    !of_machine_is_compatible("fsl,imx8mm") &&
+	    !of_machine_is_compatible("fsl,imx8mq") &&
+	    !of_machine_is_compatible("fsl,imx8qm") &&
+	    !of_machine_is_compatible("fsl,imx8qxp")) {
 		clk_disable_unprepare(ctrlpriv->caam_emi_slow);
 		clk_disable_unprepare(ctrlpriv->caam_aclk);
 		clk_disable_unprepare(ctrlpriv->caam_mem);
@@ -675,10 +680,11 @@ static int probe_w_seco(struct caam_drv_private *ctrlpriv)
 	 */
 
 	/* Set DMA masks according to platform ranging */
-	if (of_machine_is_compatible("fsl,imx8mm") ||
-		of_machine_is_compatible("fsl,imx8qm") ||
-		of_machine_is_compatible("fsl,imx8qxp") ||
-		of_machine_is_compatible("fsl,imx8mq")) {
+	if (of_machine_is_compatible("fsl,imx8mn") ||
+	    of_machine_is_compatible("fsl,imx8mm") ||
+	    of_machine_is_compatible("fsl,imx8qm") ||
+	    of_machine_is_compatible("fsl,imx8qxp") ||
+	    of_machine_is_compatible("fsl,imx8mq")) {
 		ret = dma_set_mask_and_coherent(ctrlpriv->dev,
 			DMA_BIT_MASK(32));
 	} else if (sizeof(dma_addr_t) == sizeof(u64))
diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c
index 88ec227b67a9..15371c3d5efa 100644
--- a/drivers/crypto/caam/jr.c
+++ b/drivers/crypto/caam/jr.c
@@ -631,10 +631,11 @@ static int caam_jr_probe(struct platform_device *pdev)
 
 	jrpriv->rregs = (struct caam_job_ring __iomem __force *)ctrl;
 
-	if (of_machine_is_compatible("fsl,imx8mm") ||
-		of_machine_is_compatible("fsl,imx8qm") ||
-		of_machine_is_compatible("fsl,imx8qxp") ||
-		of_machine_is_compatible("fsl,imx8mq")) {
+	if (of_machine_is_compatible("fsl,imx8mn") ||
+	    of_machine_is_compatible("fsl,imx8mm") ||
+	    of_machine_is_compatible("fsl,imx8qm") ||
+	    of_machine_is_compatible("fsl,imx8qxp") ||
+	    of_machine_is_compatible("fsl,imx8mq")) {
 		error = dma_set_mask_and_coherent(jrdev, DMA_BIT_MASK(32));
 	} else if (sizeof(dma_addr_t) == sizeof(u64)) {
 		if (caam_dpaa2)