]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
crypto: caam - disable some clock checks for iMX7ULP
authorIuliana Prodan <iuliana.prodan@nxp.com>
Fri, 31 May 2019 11:06:34 +0000 (14:06 +0300)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 6 Jun 2019 06:44:16 +0000 (14:44 +0800)
Disabled the check and set of 'mem' and 'emi_slow'
clocks, since these are not available for iMX7ULP.

Signed-off-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 bbde6efce8af212396c0b47f7882bb2c799346f3..5d197e879899747117dc41ccf5ab2ada294fe2e6 100644 (file)
@@ -540,7 +540,8 @@ static int caam_probe(struct platform_device *pdev)
        ctrlpriv->caam_ipg = clk;
 
        if (!of_machine_is_compatible("fsl,imx7d") &&
-           !of_machine_is_compatible("fsl,imx7s")) {
+           !of_machine_is_compatible("fsl,imx7s") &&
+           !of_machine_is_compatible("fsl,imx7ulp")) {
                clk = caam_drv_identify_clk(&pdev->dev, "mem");
                if (IS_ERR(clk)) {
                        ret = PTR_ERR(clk);
@@ -562,7 +563,8 @@ static int caam_probe(struct platform_device *pdev)
 
        if (!of_machine_is_compatible("fsl,imx6ul") &&
            !of_machine_is_compatible("fsl,imx7d") &&
-           !of_machine_is_compatible("fsl,imx7s")) {
+           !of_machine_is_compatible("fsl,imx7s") &&
+           !of_machine_is_compatible("fsl,imx7ulp")) {
                clk = caam_drv_identify_clk(&pdev->dev, "emi_slow");
                if (IS_ERR(clk)) {
                        ret = PTR_ERR(clk);