With all four of Vybrid VF610, i.MX6q, i.MX6qp, and i.MX8M, this patch caused no regressions for me. Additionally, with the VF610 and a follow on devicetree patch, the CAAM is detected and works.
Tested by: Chris Healy <[email protected]> On Fri, May 15, 2020 at 9:23 PM Andrey Smirnov <[email protected]> wrote: > > Vyrbrid devices don't have any clock that need to be taken care of, so > make clock data optional on i.MX. > > Signed-off-by: Andrey Smirnov <[email protected]> > Cc: Chris Healy <[email protected]> > Cc: Horia Geantă <[email protected]> > Cc: Herbert Xu <[email protected]> > Cc: Fabio Estevam <[email protected]> > Cc: [email protected] > Cc: [email protected] > Cc: [email protected] > --- > drivers/crypto/caam/ctrl.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c > index 4fcdd262e581..6aba430793cc 100644 > --- a/drivers/crypto/caam/ctrl.c > +++ b/drivers/crypto/caam/ctrl.c > @@ -630,12 +630,7 @@ static int caam_probe(struct platform_device *pdev) > imx_soc_match = soc_device_match(caam_imx_soc_table); > caam_imx = (bool)imx_soc_match; > > - if (imx_soc_match) { > - if (!imx_soc_match->data) { > - dev_err(dev, "No clock data provided for i.MX SoC"); > - return -EINVAL; > - } > - > + if (imx_soc_match && imx_soc_match->data) { > ret = init_clocks(dev, imx_soc_match->data); > if (ret) > return ret; > -- > 2.21.3
