1 files changed, 72 insertions, 24 deletions

diff --git a/drivers/clk/ti/interface.c b/drivers/clk/ti/interface.c
index 9c3e8c4aaa40..d71cd9b5de46 100644
--- a/drivers/clk/ti/interface.c
+++ b/drivers/clk/ti/interface.c
@@ -20,6 +20,7 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/clk/ti.h>
+#include "clock.h"
 
 #undef pr_fmt
 #define pr_fmt(fmt) "%s: " fmt, __func__
@@ -31,53 +32,100 @@ static const struct clk_ops ti_interface_clk_ops = {
         .is_enabled     = &omap2_dflt_clk_is_enabled,
 };
 
-static void __init _of_ti_interface_clk_setup(struct device_node *node,
-                                              const struct clk_hw_omap_ops *ops)
+static struct clk *_register_interface(struct device *dev, const char *name,
+                                       const char *parent_name,
+                                       void __iomem *reg, u8 bit_idx,
+                                       const struct clk_hw_omap_ops *ops)
 {
-        struct clk *clk;
         struct clk_init_data init = { NULL };
         struct clk_hw_omap *clk_hw;
-        const char *parent_name;
-        u32 val;
+        struct clk *clk;
 
         clk_hw = kzalloc(sizeof(*clk_hw), GFP_KERNEL);
         if (!clk_hw)
-                return;
+                return ERR_PTR(-ENOMEM);
 
         clk_hw->hw.init = &init;
         clk_hw->ops = ops;
         clk_hw->flags = MEMMAP_ADDRESSING;
+        clk_hw->enable_reg = reg;
+        clk_hw->enable_bit = bit_idx;
 
-        clk_hw->enable_reg = ti_clk_get_reg_addr(node, 0);
-        if (!clk_hw->enable_reg)
-                goto cleanup;
-
-        if (!of_property_read_u32(node, "ti,bit-shift", &val))
-                clk_hw->enable_bit = val;
-
-        init.name = node->name;
+        init.name = name;
         init.ops = &ti_interface_clk_ops;
         init.flags = 0;
 
-        parent_name = of_clk_get_parent_name(node, 0);
-        if (!parent_name) {
-                pr_err("%s must have a parent\n", node->name);
-                goto cleanup;
-        }
-
         init.num_parents = 1;
         init.parent_names = &parent_name;
 
         clk = clk_register(NULL, &clk_hw->hw);
 
-        if (!IS_ERR(clk)) {
-                of_clk_add_provider(node, of_clk_src_simple_get, clk);
+        if (IS_ERR(clk))
+                kfree(clk_hw);
+        else
                 omap2_init_clk_hw_omap_clocks(clk);
+
+        return clk;
+}
+
+struct clk *ti_clk_register_interface(struct ti_clk *setup)
+{
+        const struct clk_hw_omap_ops *ops = &clkhwops_iclk_wait;
+        u32 reg;
+        struct clk_omap_reg *reg_setup;
+        struct ti_clk_gate *gate;
+
+        gate = setup->data;
+        reg_setup = (struct clk_omap_reg *)&reg;
+        reg_setup->index = gate->module;
+        reg_setup->offset = gate->reg;
+
+        if (gate->flags & CLKF_NO_WAIT)
+                ops = &clkhwops_iclk;
+
+        if (gate->flags & CLKF_HSOTGUSB)
+                ops = &clkhwops_omap3430es2_iclk_hsotgusb_wait;
+
+        if (gate->flags & CLKF_DSS)
+                ops = &clkhwops_omap3430es2_iclk_dss_usbhost_wait;
+
+        if (gate->flags & CLKF_SSI)
+                ops = &clkhwops_omap3430es2_iclk_ssi_wait;
+
+        if (gate->flags & CLKF_AM35XX)
+                ops = &clkhwops_am35xx_ipss_wait;
+
+        return _register_interface(NULL, setup->name, gate->parent,
+                                   (void __iomem *)reg, gate->bit_shift, ops);
+}
+
+static void __init _of_ti_interface_clk_setup(struct device_node *node,
+                                              const struct clk_hw_omap_ops *ops)
+{
+        struct clk *clk;
+        const char *parent_name;
+        void __iomem *reg;
+        u8 enable_bit = 0;
+        u32 val;
+
+        reg = ti_clk_get_reg_addr(node, 0);
+        if (!reg)
+                return;
+
+        if (!of_property_read_u32(node, "ti,bit-shift", &val))
+                enable_bit = val;
+
+        parent_name = of_clk_get_parent_name(node, 0);
+        if (!parent_name) {
+                pr_err("%s must have a parent\n", node->name);
                 return;
         }
 
-cleanup:
-        kfree(clk_hw);
+        clk = _register_interface(NULL, node->name, parent_name, reg,
+                                  enable_bit, ops);
+
+        if (!IS_ERR(clk))
+                of_clk_add_provider(node, of_clk_src_simple_get, clk);
 }
 
 static void __init of_ti_interface_clk_setup(struct device_node *node)