MLK-18011: imx7ulp: caam: Configure CAAM clocks

Signed-off-by: Franck LENORMAND <franck.lenormand@nxp.com>
(cherry picked from commit 0b122f882429a82274fc99439b5d73986b731672)

diff --git a/arch/arm/boot/dts/imx7ulp.dtsi b/arch/arm/boot/dts/imx7ulp.dtsi
index b22d970..2acc08c 100644 (file)
--- a/arch/arm/boot/dts/imx7ulp.dtsi
+++ b/arch/arm/boot/dts/imx7ulp.dtsi
@@ -197,13 +197,14 @@
                };
 
                crypto: caam@40240000 {
-                       compatible = "fsl,sec-v4.0";
+                       compatible = "fsl,imx7d-caam", "fsl,sec-v4.0";
                        #address-cells = <1>;
                        #size-cells = <1>;
                        reg = <0x40240000 0x40000>;
                        ranges = <0 0x40240000 0x40000>;
                        clocks = <&clks IMX7ULP_CLK_CAAM>,
                                <&clks IMX7ULP_CLK_NIC1_DIV>;
+                       clock-names = "ipg", "aclk";
 
                        sec_ctrl: ctrl@0 {
                                /* CAAM Page 0 only accessible */

diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 5f48ccd..d9f4ad0 100644 (file)
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -597,8 +597,7 @@ static int caam_probe(struct platform_device *pdev)
 
        if (!of_machine_is_compatible("fsl,imx8mq") &&
             !of_machine_is_compatible("fsl,imx8qm") &&
-            !of_machine_is_compatible("fsl,imx8qxp") &&
-            !of_machine_is_compatible("fsl,imx7ulp")) {
+            !of_machine_is_compatible("fsl,imx8qxp")) {
                ret = init_clocks(ctrlpriv);
                if (ret)
                        goto disable_clocks;
@@ -734,8 +733,7 @@ iounmap_ctrl:
 disable_clocks:
        if (!of_machine_is_compatible("fsl,imx8mq") &&
             !of_machine_is_compatible("fsl,imx8qm") &&
-            !of_machine_is_compatible("fsl,imx8qxp") &&
-            !of_machine_is_compatible("fsl,imx7ulp")) {
+            !of_machine_is_compatible("fsl,imx8qxp")) {
                clk_disable_unprepare(ctrlpriv->caam_emi_slow);
                clk_disable_unprepare(ctrlpriv->caam_aclk);
                clk_disable_unprepare(ctrlpriv->caam_mem);