crypto: caam - Add support for i.MX8M Mini
authorAdam Ford <aford173@gmail.com>
Wed, 18 Dec 2019 13:06:14 +0000 (07:06 -0600)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 27 Dec 2019 10:18:03 +0000 (18:18 +0800)
The i.MX8M Mini uses the same crypto engine as the i.MX8MQ, but
the driver is restricting the check to just the i.MX8MQ.

This patch expands the check for either i.MX8MQ or i.MX8MM.

Signed-off-by: Adam Ford <aford173@gmail.com>
Tested-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/caam/ctrl.c

index 3e811fc..6659c8d 100644 (file)
@@ -102,7 +102,8 @@ static inline int run_descriptor_deco0(struct device *ctrldev, u32 *desc,
             * Apparently on i.MX8MQ it doesn't matter if virt_en == 1
             * and the following steps should be performed regardless
             */
-           of_machine_is_compatible("fsl,imx8mq")) {
+           of_machine_is_compatible("fsl,imx8mq") ||
+           of_machine_is_compatible("fsl,imx8mm")) {
                clrsetbits_32(&ctrl->deco_rsr, 0, DECORSR_JR0);
 
                while (!(rd_reg32(&ctrl->deco_rsr) & DECORSR_VALID) &&
@@ -509,6 +510,7 @@ static const struct soc_device_attribute caam_imx_soc_table[] = {
        { .soc_id = "i.MX6*",  .data = &caam_imx6_data },
        { .soc_id = "i.MX7*",  .data = &caam_imx7_data },
        { .soc_id = "i.MX8MQ", .data = &caam_imx7_data },
+       { .soc_id = "i.MX8MM", .data = &caam_imx7_data },
        { .family = "Freescale i.MX" },
        { /* sentinel */ }
 };