clk/samsung: add support for multiple clock providers

Samsung CCF helper functions do not provide support to
register multiple Clock Providers for a given SoC. Due to
this limitation, SoC platforms are not able to use these
helpers for registering multiple clock providers and are
forced to bypass this layer.

This layer is modified accordingly to enable the support
for multiple clock providers.

Clock file for exynos4, exynos5250, exynos5420, exynos5440,
S3c64xx, S3c24xx are also modified as per changed helper functions.

Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
[t.figa: Modified s3c2410 clock driver as well]
Signed-off-by: Tomasz Figa <t.figa@samsung.com>

1 files changed, 25 insertions, 22 deletions

diff --git a/drivers/clk/samsung/clk-exynos4.c b/drivers/clk/samsung/clk-exynos4.c
index b4f967210175..57ed5a8fb052 100644
--- a/drivers/clk/samsung/clk-exynos4.c
+++ b/drivers/clk/samsung/clk-exynos4.c
@@ -1043,7 +1043,7 @@ static unsigned long exynos4_get_xom(void)
         return xom;
 }
 
-static void __init exynos4_clk_register_finpll(void)
+static void __init exynos4_clk_register_finpll(struct samsung_clk_provider *ctx)
 {
         struct samsung_fixed_rate_clock fclk;
         struct clk *clk;
@@ -1066,7 +1066,7 @@ static void __init exynos4_clk_register_finpll(void)
         fclk.parent_name = NULL;
         fclk.flags = CLK_IS_ROOT;
         fclk.fixed_rate = finpll_f;
-        samsung_clk_register_fixed_rate(&fclk, 1);
+        samsung_clk_register_fixed_rate(ctx, &fclk, 1);
 
 }
 
@@ -1176,22 +1176,25 @@ static struct samsung_pll_clock exynos4x12_plls[nr_plls] __initdata = {
 static void __init exynos4_clk_init(struct device_node *np,
                                     enum exynos4_soc soc)
 {
+        struct samsung_clk_provider *ctx;
         exynos4_soc = soc;
 
         reg_base = of_iomap(np, 0);
         if (!reg_base)
                 panic("%s: failed to map registers\n", __func__);
 
-        samsung_clk_init(np, reg_base, CLK_NR_CLKS);
+        ctx = samsung_clk_init(np, reg_base, CLK_NR_CLKS);
+        if (!ctx)
+                panic("%s: unable to allocate context.\n", __func__);
 
-        samsung_clk_of_register_fixed_ext(exynos4_fixed_rate_ext_clks,
+        samsung_clk_of_register_fixed_ext(ctx, exynos4_fixed_rate_ext_clks,
                         ARRAY_SIZE(exynos4_fixed_rate_ext_clks),
                         ext_clk_match);
 
-        exynos4_clk_register_finpll();
+        exynos4_clk_register_finpll(ctx);
 
         if (exynos4_soc == EXYNOS4210) {
-                samsung_clk_register_mux(exynos4210_mux_early,
+                samsung_clk_register_mux(ctx, exynos4210_mux_early,
                                         ARRAY_SIZE(exynos4210_mux_early));
 
                 if (_get_rate("fin_pll") == 24000000) {
@@ -1205,7 +1208,7 @@ static void __init exynos4_clk_init(struct device_node *np,
                         exynos4210_plls[vpll].rate_table =
                                                         exynos4210_vpll_rates;
 
-                samsung_clk_register_pll(exynos4210_plls,
+                samsung_clk_register_pll(ctx, exynos4210_plls,
                                         ARRAY_SIZE(exynos4210_plls), reg_base);
         } else {
                 if (_get_rate("fin_pll") == 24000000) {
@@ -1217,42 +1220,42 @@ static void __init exynos4_clk_init(struct device_node *np,
                                                         exynos4x12_vpll_rates;
                 }
 
-                samsung_clk_register_pll(exynos4x12_plls,
+                samsung_clk_register_pll(ctx, exynos4x12_plls,
                                         ARRAY_SIZE(exynos4x12_plls), reg_base);
         }
 
-        samsung_clk_register_fixed_rate(exynos4_fixed_rate_clks,
+        samsung_clk_register_fixed_rate(ctx, exynos4_fixed_rate_clks,
                         ARRAY_SIZE(exynos4_fixed_rate_clks));
-        samsung_clk_register_mux(exynos4_mux_clks,
+        samsung_clk_register_mux(ctx, exynos4_mux_clks,
                         ARRAY_SIZE(exynos4_mux_clks));
-        samsung_clk_register_div(exynos4_div_clks,
+        samsung_clk_register_div(ctx, exynos4_div_clks,
                         ARRAY_SIZE(exynos4_div_clks));
-        samsung_clk_register_gate(exynos4_gate_clks,
+        samsung_clk_register_gate(ctx, exynos4_gate_clks,
                         ARRAY_SIZE(exynos4_gate_clks));
 
         if (exynos4_soc == EXYNOS4210) {
-                samsung_clk_register_fixed_rate(exynos4210_fixed_rate_clks,
+                samsung_clk_register_fixed_rate(ctx, exynos4210_fixed_rate_clks,
                         ARRAY_SIZE(exynos4210_fixed_rate_clks));
-                samsung_clk_register_mux(exynos4210_mux_clks,
+                samsung_clk_register_mux(ctx, exynos4210_mux_clks,
                         ARRAY_SIZE(exynos4210_mux_clks));
-                samsung_clk_register_div(exynos4210_div_clks,
+                samsung_clk_register_div(ctx, exynos4210_div_clks,
                         ARRAY_SIZE(exynos4210_div_clks));
-                samsung_clk_register_gate(exynos4210_gate_clks,
+                samsung_clk_register_gate(ctx, exynos4210_gate_clks,
                         ARRAY_SIZE(exynos4210_gate_clks));
-                samsung_clk_register_alias(exynos4210_aliases,
+                samsung_clk_register_alias(ctx, exynos4210_aliases,
                         ARRAY_SIZE(exynos4210_aliases));
         } else {
-                samsung_clk_register_mux(exynos4x12_mux_clks,
+                samsung_clk_register_mux(ctx, exynos4x12_mux_clks,
                         ARRAY_SIZE(exynos4x12_mux_clks));
-                samsung_clk_register_div(exynos4x12_div_clks,
+                samsung_clk_register_div(ctx, exynos4x12_div_clks,
                         ARRAY_SIZE(exynos4x12_div_clks));
-                samsung_clk_register_gate(exynos4x12_gate_clks,
+                samsung_clk_register_gate(ctx, exynos4x12_gate_clks,
                         ARRAY_SIZE(exynos4x12_gate_clks));
-                samsung_clk_register_alias(exynos4x12_aliases,
+                samsung_clk_register_alias(ctx, exynos4x12_aliases,
                         ARRAY_SIZE(exynos4x12_aliases));
         }
 
-        samsung_clk_register_alias(exynos4_aliases,
+        samsung_clk_register_alias(ctx, exynos4_aliases,
                         ARRAY_SIZE(exynos4_aliases));
 
         exynos4_clk_sleep_init();