On 12/13/2019 5:39 PM, Adam Ford wrote:
> 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@xxxxxxxxx>
>
For the series:
Tested-by: Iuliana Prodan <iuliana.prodan@xxxxxxx>
Reviewed-by: Iuliana Prodan <iuliana.prodan@xxxxxxx>
> ---
> V2: Expand the check that forces the setting on imx8mq to also be true for imx8mm
> Explictly state imx8mm compatiblity instead of making it generic to all imx8m*
> this is mostly due to lack of other hardware to test
>
> diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
> index d7c3c3805693..c01dda692ecc 100644
> --- a/drivers/crypto/caam/ctrl.c
> +++ b/drivers/crypto/caam/ctrl.c
> @@ -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 */ }
> };
>
