[RFC 14/17] clk: samsung: clkout: samsung: Switch to new clock controller API

[Krzysztof Kozlowski]

Allocate a clock controller and use new clk_register_with_ctrl() API.

Signed-off-by: Krzysztof Kozlowski <k.kozlow...@samsung.com>
---
 drivers/clk/samsung/clk-exynos-clkout.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/samsung/clk-exynos-clkout.c 
b/drivers/clk/samsung/clk-exynos-clkout.c
index 96fab6cfb202..9c57a623e741 100644
--- a/drivers/clk/samsung/clk-exynos-clkout.c
+++ b/drivers/clk/samsung/clk-exynos-clkout.c
@@ -26,6 +26,7 @@
 #define EXYNOS5_CLKOUT_MUX_MASK                0x1f
 
 struct exynos_clkout {
+       struct clk_ctrl *clk_ctrl;
        struct clk_gate gate;
        struct clk_mux mux;
        spinlock_t slock;
@@ -66,6 +67,10 @@ static void __init exynos_clkout_init(struct device_node 
*node, u32 mux_mask)
        if (!clkout)
                return;
 
+       clkout->clk_ctrl = clk_ctrl_register(NULL);
+       if (IS_ERR(clkout->clk_ctrl))
+               goto free_clkout;
+
        spin_lock_init(&clkout->slock);
 
        parent_count = 0;
@@ -84,7 +89,7 @@ static void __init exynos_clkout_init(struct device_node 
*node, u32 mux_mask)
        }
 
        if (!parent_count)
-               goto free_clkout;
+               goto free_ctrl;
 
        clkout->reg = of_iomap(node, 0);
        if (!clkout->reg)
@@ -100,7 +105,7 @@ static void __init exynos_clkout_init(struct device_node 
*node, u32 mux_mask)
        clkout->mux.shift = EXYNOS_CLKOUT_MUX_SHIFT;
        clkout->mux.lock = &clkout->slock;
 
-       clkout->clk_table[0] = clk_register_composite(NULL, "clkout",
+       clkout->clk_table[0] = clk_register_composite(NULL, clkout->clk_ctrl, 
"clkout",
                                parent_names, parent_count, &clkout->mux.hw,
                                &clk_mux_ops, NULL, NULL, &clkout->gate.hw,
                                &clk_gate_ops, CLK_SET_RATE_PARENT
@@ -126,6 +131,8 @@ clks_put:
        for (i = 0; i < EXYNOS_CLKOUT_PARENTS; ++i)
                if (!IS_ERR(parents[i]))
                        clk_put(parents[i]);
+free_ctrl:
+       clk_ctrl_unregister(clkout->clk_ctrl);
 free_clkout:
        kfree(clkout);
 
-- 
1.9.1