clk: sunxi: Unify oscillator clock

This commit uses the new fixed-rate support on the composite clock to
unify osc24M_fixed and osc24M clocks, so it matches the actual hardware.

Signed-off-by: Emilio López <emilio@elopez.com.ar>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
[mturquette@linaro.org: replace clk_register_gatable_osc with a call to
clk_register_composite]

diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index 0bb0eb4ed217b131dd13171d3e84bfb343ca37f8..8492ad1d53601d19c0c0481e8c12bd696dd00683 100644 (file)
--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -33,16 +33,36 @@ static DEFINE_SPINLOCK(clk_lock);
 static void __init sunxi_osc_clk_setup(struct device_node *node)
 {
        struct clk *clk;
+       struct clk_fixed_rate *fixed;
+       struct clk_gate *gate;
        const char *clk_name = node->name;
-       const char *parent;
-       void *reg;
+       u32 rate;
 
-       reg = of_iomap(node, 0);
+       /* allocate fixed-rate and gate clock structs */
+       fixed = kzalloc(sizeof(struct clk_fixed_rate), GFP_KERNEL);
+       if (!fixed)
+               return;
+       gate = kzalloc(sizeof(struct clk_gate), GFP_KERNEL);
+       if (!gate) {
+               kfree(fixed);
+               return;
+       }
 
-       parent = of_clk_get_parent_name(node, 0);
+       if (of_property_read_u32(node, "clock-frequency", &rate))
+               return;
+
+       /* set up gate and fixed rate properties */
+       gate->reg = of_iomap(node, 0);
+       gate->bit_idx = SUNXI_OSC24M_GATE;
+       gate->lock = &clk_lock;
+       fixed->fixed_rate = rate;
 
-       clk = clk_register_gate(NULL, clk_name, parent, 0, reg,
-                               SUNXI_OSC24M_GATE, 0, &clk_lock);
+       clk = clk_register_composite(NULL, clk_name,
+                       NULL, 0,
+                       NULL, NULL,
+                       &fixed->hw, &clk_fixed_rate_ops,
+                       &gate->hw, &clk_gate_ops,
+                       CLK_IS_ROOT);
 
        if (clk) {
                of_clk_add_provider(node, of_clk_src_simple_get, clk);
@@ -380,7 +400,6 @@ static void __init sunxi_gates_clk_setup(struct device_node *node,
 
 /* Matches for of_clk_init */
 static const __initconst struct of_device_id clk_match[] = {
-       {.compatible = "fixed-clock", .data = of_fixed_clk_setup,},
        {.compatible = "allwinner,sun4i-osc-clk", .data = sunxi_osc_clk_setup,},
        {}
 };