clk: samsung: Set dev in samsung_clk_init()

Some drivers set dev to context in order to implement PM. Make that part
of samsung_clk_init() instead of assigning `ctx->dev = dev' separately.

No functional change.

Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Link: https://lore.kernel.org/r/20230223041938.22732-4-semen.protsenko@linaro.org
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

diff --git a/drivers/clk/samsung/clk-exynos4.c b/drivers/clk/samsung/clk-exynos4.c
index 7a9994144d72924bf781a70b6667b89a0c6562c3..d7dbb38583471e86d5c1eeb3723196d1356addbf 100644 (file)
--- a/drivers/clk/samsung/clk-exynos4.c
+++ b/drivers/clk/samsung/clk-exynos4.c
@@ -1251,7 +1251,7 @@ static void __init exynos4_clk_init(struct device_node *np,
        if (!reg_base)
                panic("%s: failed to map registers\n", __func__);
 
-       ctx = samsung_clk_init(reg_base, CLK_NR_CLKS);
+       ctx = samsung_clk_init(NULL, reg_base, CLK_NR_CLKS);
        hws = ctx->clk_data.hws;
 
        samsung_clk_of_register_fixed_ext(ctx, exynos4_fixed_rate_ext_clks,

diff --git a/drivers/clk/samsung/clk-exynos4412-isp.c b/drivers/clk/samsung/clk-exynos4412-isp.c
index 0b6390e04533c482bf7de62b9b12fe4a0b959265..1470c15e95da3851c7f8e16272a392d81d053660 100644 (file)
--- a/drivers/clk/samsung/clk-exynos4412-isp.c
+++ b/drivers/clk/samsung/clk-exynos4412-isp.c
@@ -121,8 +121,7 @@ static int __init exynos4x12_isp_clk_probe(struct platform_device *pdev)
        if (!exynos4x12_save_isp)
                return -ENOMEM;
 
-       ctx = samsung_clk_init(reg_base, CLK_NR_ISP_CLKS);
-       ctx->dev = dev;
+       ctx = samsung_clk_init(dev, reg_base, CLK_NR_ISP_CLKS);
 
        platform_set_drvdata(pdev, ctx);
 

diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c
index f1cb69aea10e8b04b42f85480de5ee55e6550001..92fb09922f2800d7e14d2c3d51d242a56e2200ba 100644 (file)
--- a/drivers/clk/samsung/clk-exynos5250.c
+++ b/drivers/clk/samsung/clk-exynos5250.c
@@ -797,7 +797,7 @@ static void __init exynos5250_clk_init(struct device_node *np)
                panic("%s: unable to determine soc\n", __func__);
        }
 
-       ctx = samsung_clk_init(reg_base, CLK_NR_CLKS);
+       ctx = samsung_clk_init(NULL, reg_base, CLK_NR_CLKS);
        hws = ctx->clk_data.hws;
 
        samsung_clk_of_register_fixed_ext(ctx, exynos5250_fixed_rate_ext_clks,

diff --git a/drivers/clk/samsung/clk-exynos5420.c b/drivers/clk/samsung/clk-exynos5420.c
index 46cac4980be2c6f1422dcbe3a59f6ced1c21137f..1e0cbf762408b169e8b79da94c34c7ad792e45cd 100644 (file)
--- a/drivers/clk/samsung/clk-exynos5420.c
+++ b/drivers/clk/samsung/clk-exynos5420.c
@@ -1587,7 +1587,7 @@ static void __init exynos5x_clk_init(struct device_node *np,
 
        exynos5x_soc = soc;
 
-       ctx = samsung_clk_init(reg_base, CLK_NR_CLKS);
+       ctx = samsung_clk_init(NULL, reg_base, CLK_NR_CLKS);
        hws = ctx->clk_data.hws;
 
        samsung_clk_of_register_fixed_ext(ctx, exynos5x_fixed_rate_ext_clks,

diff --git a/drivers/clk/samsung/clk-s3c64xx.c b/drivers/clk/samsung/clk-s3c64xx.c
index 47e9d19486dcdef962a452419cdf90cbdc5934c8..d27a1f73f077e31ff7a42d8dbdade6ab1f373fb1 100644 (file)
--- a/drivers/clk/samsung/clk-s3c64xx.c
+++ b/drivers/clk/samsung/clk-s3c64xx.c
@@ -405,7 +405,7 @@ void __init s3c64xx_clk_init(struct device_node *np, unsigned long xtal_f,
                        panic("%s: failed to map registers\n", __func__);
        }
 
-       ctx = samsung_clk_init(reg_base, NR_CLKS);
+       ctx = samsung_clk_init(NULL, reg_base, NR_CLKS);
        hws = ctx->clk_data.hws;
 
        /* Register external clocks. */

diff --git a/drivers/clk/samsung/clk-s5pv210.c b/drivers/clk/samsung/clk-s5pv210.c
index b0ab6bc9d21d0f964044c1d446fccab4d9db7529..cd85342e4ddbe28538d9f30e88c490089adc5e2c 100644 (file)
--- a/drivers/clk/samsung/clk-s5pv210.c
+++ b/drivers/clk/samsung/clk-s5pv210.c
@@ -743,7 +743,7 @@ static void __init __s5pv210_clk_init(struct device_node *np,
        struct samsung_clk_provider *ctx;
        struct clk_hw **hws;
 
-       ctx = samsung_clk_init(reg_base, NR_CLKS);
+       ctx = samsung_clk_init(NULL, reg_base, NR_CLKS);
        hws = ctx->clk_data.hws;
 
        samsung_clk_register_mux(ctx, early_mux_clks,

diff --git a/drivers/clk/samsung/clk.c b/drivers/clk/samsung/clk.c
index 2436223aac1a8a2e4a4bedb1037f50fd9872bbd8..912dfbe5ac2038a14c5622200ba5f1b0767bf751 100644 (file)
--- a/drivers/clk/samsung/clk.c
+++ b/drivers/clk/samsung/clk.c
@@ -53,9 +53,19 @@ struct samsung_clk_reg_dump *samsung_clk_alloc_reg_dump(
        return rd;
 }
 
-/* setup the essentials required to support clock lookup using ccf */
-struct samsung_clk_provider * __init samsung_clk_init(void __iomem *base,
-                       unsigned long nr_clks)
+/**
+ * samsung_clk_init() - Create and initialize a clock provider object
+ * @dev:       CMU device to enable runtime PM, or NULL if RPM is not needed
+ * @base:      Start address (mapped) of CMU registers
+ * @nr_clks:   Total clock count to allocate in clock provider object
+ *
+ * Setup the essentials required to support clock lookup using Common Clock
+ * Framework.
+ *
+ * Return: Allocated and initialized clock provider object.
+ */
+struct samsung_clk_provider * __init samsung_clk_init(struct device *dev,
+                       void __iomem *base, unsigned long nr_clks)
 {
        struct samsung_clk_provider *ctx;
        int i;
@@ -67,6 +77,7 @@ struct samsung_clk_provider * __init samsung_clk_init(void __iomem *base,
        for (i = 0; i < nr_clks; ++i)
                ctx->clk_data.hws[i] = ERR_PTR(-ENOENT);
 
+       ctx->dev = dev;
        ctx->reg_base = base;
        ctx->clk_data.num = nr_clks;
        spin_lock_init(&ctx->lock);
@@ -341,7 +352,7 @@ struct samsung_clk_provider * __init samsung_cmu_register_one(
                return NULL;
        }
 
-       ctx = samsung_clk_init(reg_base, cmu->nr_clk_ids);
+       ctx = samsung_clk_init(NULL, reg_base, cmu->nr_clk_ids);
 
        if (cmu->pll_clks)
                samsung_clk_register_pll(ctx, cmu->pll_clks, cmu->nr_pll_clks);

diff --git a/drivers/clk/samsung/clk.h b/drivers/clk/samsung/clk.h
index 98753b0e5055eb002cf696d0c334d8be889f48d4..3fd6c0868921abc3d6c6c17db1fda60e145cb2f1 100644 (file)
--- a/drivers/clk/samsung/clk.h
+++ b/drivers/clk/samsung/clk.h
@@ -16,6 +16,7 @@
 /**
  * struct samsung_clk_provider: information about clock provider
  * @reg_base: virtual address for the register base.
+ * @dev: clock provider device needed for runtime PM.
  * @lock: maintains exclusion between callbacks for a given clock-provider.
  * @clk_data: holds clock related data like clk_hw* and number of clocks.
  */
@@ -337,8 +338,8 @@ struct samsung_cmu_info {
        const char *clk_name;
 };
 
-struct samsung_clk_provider *samsung_clk_init(void __iomem *base,
-                       unsigned long nr_clks);
+struct samsung_clk_provider *samsung_clk_init(struct device *dev,
+                       void __iomem *base, unsigned long nr_clks);
 void samsung_clk_of_add_provider(struct device_node *np,
                        struct samsung_clk_provider *ctx);
 void samsung_clk_of_register_fixed_ext(