On 4/10/2024 11:00 AM, Pankaj Gupta wrote:
> CAAM clock initialization to be done based on, soc specific
> info stored in struct caam_imx_data:
> - caam-page0-access flag
> - num_clks
>
[...]
> +static const struct caam_imx_data caam_imx8ulp_data = {
> + .page0_access = false,
> + .clks = NULL,
> + .num_clks = 0,
> +};
Not needed, an empty static struct would do.
> static const struct soc_device_attribute caam_imx_soc_table[] = {
> { .soc_id = "i.MX6UL", .data = &caam_imx6ul_data },
> { .soc_id = "i.MX6*", .data = &caam_imx6_data },
> { .soc_id = "i.MX7*", .data = &caam_imx7_data },
> { .soc_id = "i.MX8M*", .data = &caam_imx7_data },
> + { .soc_id = "i.MX8ULP", .data = &caam_imx8ulp_data },
> { .soc_id = "VF*", .data = &caam_vf610_data },
> { .family = "Freescale i.MX" },
> { /* sentinel */ }
As Francesco pointed out in v1, this change is not related.
Ideally, adding support for i.MX8ULP SoC should be done in a separate patch,
explaining a bit the particularities - similar to the commit message here:
https://github.com/nxp-imx/linux-imx/commit/d420f224ee02c164f6bdb3c8bbb5ec5827eaba37
> @@ -889,7 +902,15 @@ static int caam_probe(struct platform_device *pdev)
>
> reg_access = !ctrlpriv->optee_en;
>
> - if (!imx_soc_match->data) {
> + if (imx_soc_match->data) {
> + imx_soc_data = imx_soc_match->data;
> + reg_access = reg_access && imx_soc_data->page0_access;
> + /*
> + * CAAM clocks cannot be controlled from kernel.
> + */
> + if (!imx_soc_data->num_clks)
> + goto iomap_ctrl;
> + } else {
> dev_err(dev, "No clock data provided for i.MX SoC");
> return -EINVAL;
> }
if/else could be avoided, making code simpler:
if (!imx_soc_match->data) {
dev_err(dev, "No clock data provided for i.MX SoC");
return -EINVAL;
}
imx_soc_data = imx_soc_match->data;
reg_access = reg_access && imx_soc_data->page0_access;
/* CAAM clocks cannot be controlled from kernel. */
if (!imx_soc_data->num_clks)
goto iomap_ctrl;
Regards,
Horia
