Simplify clock initialization code by converting it to use clk-bulk,
devres and soc_device_match() match table. No functional change
intended.

Signed-off-by: Andrey Smirnov <andrew.smir...@gmail.com>
Cc: Chris Spencer <christopher.spen...@sea.co.uk>
Cc: Cory Tusar <cory.tu...@zii.aero>
Cc: Chris Healy <cphe...@gmail.com>
Cc: Lucas Stach <l.st...@pengutronix.de>
Cc: Horia Geantă <horia.gea...@nxp.com>
Cc: Aymen Sghaier <aymen.sgha...@nxp.com>
Cc: Leonard Crestez <leonard.cres...@nxp.com>
Cc: linux-crypto@vger.kernel.org
Cc: linux-ker...@vger.kernel.org
---
 drivers/crypto/caam/ctrl.c   | 214 +++++++++++++++++------------------
 drivers/crypto/caam/intern.h |   5 -
 2 files changed, 107 insertions(+), 112 deletions(-)

diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index e6e2457a573e..b9655957d369 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -25,16 +25,6 @@ EXPORT_SYMBOL(caam_dpaa2);
 #include "qi.h"
 #endif
 
-/*
- * i.MX targets tend to have clock control subsystems that can
- * enable/disable clocking to our device.
- */
-static inline struct clk *caam_drv_identify_clk(struct device *dev,
-                                               char *clk_name)
-{
-       return caam_imx ? devm_clk_get(dev, clk_name) : NULL;
-}
-
 /*
  * Descriptor to instantiate RNG State Handle 0 in normal mode and
  * load the JDKEK, TDKEK and TDSK registers
@@ -347,13 +337,6 @@ static int caam_remove(struct platform_device *pdev)
        /* Unmap controller region */
        iounmap(ctrl);
 
-       /* shut clocks off before finalizing shutdown */
-       clk_disable_unprepare(ctrlpriv->caam_ipg);
-       if (ctrlpriv->caam_mem)
-               clk_disable_unprepare(ctrlpriv->caam_mem);
-       clk_disable_unprepare(ctrlpriv->caam_aclk);
-       if (ctrlpriv->caam_emi_slow)
-               clk_disable_unprepare(ctrlpriv->caam_emi_slow);
        return 0;
 }
 
@@ -502,20 +485,113 @@ static const struct of_device_id caam_match[] = {
 };
 MODULE_DEVICE_TABLE(of, caam_match);
 
+struct clk_bulk_caam {
+       const struct clk_bulk_data *clks;
+       int num_clks;
+};
+
+static const struct clk_bulk_data caam_imx6_clks[] = {
+       { .id = "ipg" },
+       { .id = "mem" },
+       { .id = "aclk" },
+       { .id = "emi_slow" },
+};
+
+static const struct clk_bulk_caam caam_imx6_clk_data = {
+       .clks = caam_imx6_clks,
+       .num_clks = ARRAY_SIZE(caam_imx6_clks),
+};
+
+static const struct clk_bulk_data caam_imx7_clks[] = {
+       { .id = "ipg" },
+       { .id = "aclk" },
+};
+
+static const struct clk_bulk_caam caam_imx7_clk_data = {
+       .clks = caam_imx7_clks,
+       .num_clks = ARRAY_SIZE(caam_imx7_clks),
+};
+
+static const struct clk_bulk_data caam_imx6ul_clks[] = {
+       { .id = "ipg" },
+       { .id = "mem" },
+       { .id = "aclk" },
+};
+
+static const struct clk_bulk_caam caam_imx6ul_clk_data = {
+       .clks = caam_imx6ul_clks,
+       .num_clks = ARRAY_SIZE(caam_imx6ul_clks),
+};
+
+
+static const struct soc_device_attribute imx_soc[] = {
+       { .soc_id = "i.MX6UL", .data = &caam_imx6ul_clk_data },
+       { .soc_id = "i.MX6*",  .data = &caam_imx6_clk_data },
+       { .soc_id = "i.MX7*",  .data = &caam_imx7_clk_data },
+       { .family = "Freescale i.MX" },
+};
+
+static void disable_clocks(void *private)
+{
+       struct clk_bulk_caam *context = private;
+
+       clk_bulk_disable_unprepare(context->num_clks,
+                                  (struct clk_bulk_data *)context->clks);
+}
+
+static int init_clocks(struct device *dev,
+                      const struct clk_bulk_caam *data)
+{
+       struct clk_bulk_data *clks;
+       struct clk_bulk_caam *context;
+       int num_clks;
+       int ret;
+
+       num_clks = data->num_clks;
+       clks = devm_kmemdup(dev, data->clks,
+                           data->num_clks * sizeof(data->clks[0]),
+                           GFP_KERNEL);
+       if (!clks)
+               return -ENOMEM;
+
+       ret = devm_clk_bulk_get(dev, num_clks, clks);
+       if (ret) {
+               dev_err(dev,
+                       "Failed to request all necessary clocks\n");
+               return ret;
+       }
+
+       ret = clk_bulk_prepare_enable(num_clks, clks);
+       if (ret) {
+               dev_err(dev,
+                       "Failed to prepare/enable all necessary clocks\n");
+               return ret;
+       }
+
+       context = devm_kzalloc(dev, sizeof(*context), GFP_KERNEL);
+       if (!context)
+               return -ENOMEM;
+
+       context->num_clks = num_clks;
+       context->clks = clks;
+
+       ret = devm_add_action_or_reset(dev, disable_clocks, context);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
 /* Probe routine for CAAM top (controller) level */
 static int caam_probe(struct platform_device *pdev)
 {
        int ret, ring, gen_sk, ent_delay = RTSDCTL_ENT_DLY_MIN;
        u64 caam_id;
-       static const struct soc_device_attribute imx_soc[] = {
-               {.family = "Freescale i.MX"},
-               {},
-       };
+       const struct soc_device_attribute *soc_attr;
        struct device *dev;
        struct device_node *nprop, *np;
        struct caam_ctrl __iomem *ctrl;
        struct caam_drv_private *ctrlpriv;
-       struct clk *clk;
 #ifdef CONFIG_DEBUG_FS
        struct caam_perfmon *perfmon;
 #endif
@@ -532,91 +608,25 @@ static int caam_probe(struct platform_device *pdev)
        dev_set_drvdata(dev, ctrlpriv);
        nprop = pdev->dev.of_node;
 
-       caam_imx = (bool)soc_device_match(imx_soc);
-
-       /* Enable clocking */
-       clk = caam_drv_identify_clk(&pdev->dev, "ipg");
-       if (IS_ERR(clk)) {
-               ret = PTR_ERR(clk);
-               dev_err(&pdev->dev,
-                       "can't identify CAAM ipg clk: %d\n", ret);
-               return ret;
-       }
-       ctrlpriv->caam_ipg = clk;
-
-       if (!of_machine_is_compatible("fsl,imx7d") &&
-           !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);
-                       dev_err(&pdev->dev,
-                               "can't identify CAAM mem clk: %d\n", ret);
-                       return ret;
+       soc_attr = soc_device_match(imx_soc);
+       if (soc_attr) {
+               if (!soc_attr->data) {
+                       dev_err(dev, "No clock data provided for i.MX SoC");
+                       return -EINVAL;
                }
-               ctrlpriv->caam_mem = clk;
-       }
 
-       clk = caam_drv_identify_clk(&pdev->dev, "aclk");
-       if (IS_ERR(clk)) {
-               ret = PTR_ERR(clk);
-               dev_err(&pdev->dev,
-                       "can't identify CAAM aclk clk: %d\n", ret);
-               return ret;
-       }
-       ctrlpriv->caam_aclk = clk;
-
-       if (!of_machine_is_compatible("fsl,imx6ul") &&
-           !of_machine_is_compatible("fsl,imx7d") &&
-           !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);
-                       dev_err(&pdev->dev,
-                               "can't identify CAAM emi_slow clk: %d\n", ret);
+               ret = init_clocks(dev, soc_attr->data);
+               if (ret)
                        return ret;
-               }
-               ctrlpriv->caam_emi_slow = clk;
-       }
-
-       ret = clk_prepare_enable(ctrlpriv->caam_ipg);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "can't enable CAAM ipg clock: %d\n", ret);
-               return ret;
-       }
-
-       if (ctrlpriv->caam_mem) {
-               ret = clk_prepare_enable(ctrlpriv->caam_mem);
-               if (ret < 0) {
-                       dev_err(&pdev->dev, "can't enable CAAM secure mem 
clock: %d\n",
-                               ret);
-                       goto disable_caam_ipg;
-               }
-       }
-
-       ret = clk_prepare_enable(ctrlpriv->caam_aclk);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "can't enable CAAM aclk clock: %d\n", ret);
-               goto disable_caam_mem;
-       }
-
-       if (ctrlpriv->caam_emi_slow) {
-               ret = clk_prepare_enable(ctrlpriv->caam_emi_slow);
-               if (ret < 0) {
-                       dev_err(&pdev->dev, "can't enable CAAM emi slow clock: 
%d\n",
-                               ret);
-                       goto disable_caam_aclk;
-               }
        }
+       caam_imx = (bool)soc_attr;
 
        /* Get configuration properties from device tree */
        /* First, get register page */
        ctrl = of_iomap(nprop, 0);
        if (ctrl == NULL) {
                dev_err(dev, "caam: of_iomap() failed\n");
-               ret = -ENOMEM;
-               goto disable_caam_emi_slow;
+               return -ENOMEM;
        }
 
        caam_little_end = !(bool)(rd_reg32(&ctrl->perfmon.status) &
@@ -904,16 +914,6 @@ static int caam_probe(struct platform_device *pdev)
 #endif
 iounmap_ctrl:
        iounmap(ctrl);
-disable_caam_emi_slow:
-       if (ctrlpriv->caam_emi_slow)
-               clk_disable_unprepare(ctrlpriv->caam_emi_slow);
-disable_caam_aclk:
-       clk_disable_unprepare(ctrlpriv->caam_aclk);
-disable_caam_mem:
-       if (ctrlpriv->caam_mem)
-               clk_disable_unprepare(ctrlpriv->caam_mem);
-disable_caam_ipg:
-       clk_disable_unprepare(ctrlpriv->caam_ipg);
        return ret;
 }
 
diff --git a/drivers/crypto/caam/intern.h b/drivers/crypto/caam/intern.h
index bf115f8ddb93..81f73d32a9f8 100644
--- a/drivers/crypto/caam/intern.h
+++ b/drivers/crypto/caam/intern.h
@@ -94,11 +94,6 @@ struct caam_drv_private {
                                   Handles of the RNG4 block are initialized
                                   by this driver */
 
-       struct clk *caam_ipg;
-       struct clk *caam_mem;
-       struct clk *caam_aclk;
-       struct clk *caam_emi_slow;
-
        /*
         * debugfs entries for developer view into driver/device
         * variables at runtime.
-- 
2.21.0

Reply via email to