6 files changed, 31 insertions, 24 deletions

diff --git a/drivers/clk/ti/apll.c b/drivers/clk/ti/apll.c
index 222f68bc3f2a..015a657d3382 100644
--- a/drivers/clk/ti/apll.c
+++ b/drivers/clk/ti/apll.c
@@ -165,7 +165,7 @@ static void __init omap_clk_register_apll(void *user,
 
         ad->clk_bypass = __clk_get_hw(clk);
 
-        clk = ti_clk_register(NULL, &clk_hw->hw, node->name);
+        clk = ti_clk_register_omap_hw(NULL, &clk_hw->hw, node->name);
         if (!IS_ERR(clk)) {
                 of_clk_add_provider(node, of_clk_src_simple_get, clk);
                 kfree(clk_hw->hw.init->parent_names);
@@ -402,7 +402,7 @@ static void __init of_omap2_apll_setup(struct device_node *node)
         if (ret)
                 goto cleanup;
 
-        clk = clk_register(NULL, &clk_hw->hw);
+        clk = ti_clk_register_omap_hw(NULL, &clk_hw->hw, node->name);
         if (!IS_ERR(clk)) {
                 of_clk_add_provider(node, of_clk_src_simple_get, clk);
                 kfree(init);
diff --git a/drivers/clk/ti/clk.c b/drivers/clk/ti/clk.c
index 122af2680833..d1f948163d6a 100644
--- a/drivers/clk/ti/clk.c
+++ b/drivers/clk/ti/clk.c
@@ -520,20 +520,31 @@ struct clk *ti_clk_register(struct device *dev, struct clk_hw *hw,
 }
 
 /**
- * omap2_init_clk_hw_omap_clocks - initialize an OMAP clock
- * @hw: struct clk_hw * to initialize
+ * ti_clk_register_omap_hw - register a clk_hw_omap to the clock framework
+ * @dev: device for this clock
+ * @hw: hardware clock handle
+ * @con: connection ID for this clock
  *
- * Add an OMAP clock @clk to the internal list of OMAP clocks.  Used
- * temporarily for autoidle handling, until this support can be
- * integrated into the common clock framework code in some way.  No
- * return value.
+ * Registers a clk_hw_omap clock to the clock framewor, adds a clock alias
+ * for it, and adds the list to the available clk_hw_omap type clocks.
+ * Returns a handle to the registered clock if successful, ERR_PTR value
+ * in failure.
  */
-void omap2_init_clk_hw_omap_clocks(struct clk_hw *hw)
+struct clk *ti_clk_register_omap_hw(struct device *dev, struct clk_hw *hw,
+                                    const char *con)
 {
-        struct clk_hw_omap *c;
+        struct clk *clk;
+        struct clk_hw_omap *oclk;
 
-        c = to_clk_hw_omap(hw);
-        list_add(&c->node, &clk_hw_omap_clocks);
+        clk = ti_clk_register(dev, hw, con);
+        if (IS_ERR(clk))
+                return clk;
+
+        oclk = to_clk_hw_omap(hw);
+
+        list_add(&oclk->node, &clk_hw_omap_clocks);
+
+        return clk;
 }
 
 /**
diff --git a/drivers/clk/ti/clock.h b/drivers/clk/ti/clock.h
index 034ff6a2be07..1c0fac59d809 100644
--- a/drivers/clk/ti/clock.h
+++ b/drivers/clk/ti/clock.h
@@ -203,6 +203,8 @@ typedef void (*ti_of_clk_init_cb_t)(void *, struct device_node *);
 
 struct clk *ti_clk_register(struct device *dev, struct clk_hw *hw,
                             const char *con);
+struct clk *ti_clk_register_omap_hw(struct device *dev, struct clk_hw *hw,
+                                    const char *con);
 int ti_clk_add_alias(struct device *dev, struct clk *clk, const char *con);
 void ti_clk_add_aliases(void);
 
@@ -221,7 +223,6 @@ int ti_clk_retry_init(struct device_node *node, void *user,
                       ti_of_clk_init_cb_t func);
 int ti_clk_add_component(struct device_node *node, struct clk_hw *hw, int type);
 
-void omap2_init_clk_hw_omap_clocks(struct clk_hw *hw);
 int of_ti_clk_autoidle_setup(struct device_node *node);
 void omap2_clk_enable_init_clocks(const char **clk_names, u8 num_clocks);
 
diff --git a/drivers/clk/ti/dpll.c b/drivers/clk/ti/dpll.c
index 6c3329bc116f..659dadb23279 100644
--- a/drivers/clk/ti/dpll.c
+++ b/drivers/clk/ti/dpll.c
@@ -192,10 +192,9 @@ static void __init _register_dpll(void *user,
         dd->clk_bypass = __clk_get_hw(clk);
 
         /* register the clock */
-        clk = ti_clk_register(NULL, &clk_hw->hw, node->name);
+        clk = ti_clk_register_omap_hw(NULL, &clk_hw->hw, node->name);
 
         if (!IS_ERR(clk)) {
-                omap2_init_clk_hw_omap_clocks(&clk_hw->hw);
                 of_clk_add_provider(node, of_clk_src_simple_get, clk);
                 kfree(clk_hw->hw.init->parent_names);
                 kfree(clk_hw->hw.init);
@@ -265,14 +264,12 @@ static void _register_dpll_x2(struct device_node *node,
 #endif
 
         /* register the clock */
-        clk = ti_clk_register(NULL, &clk_hw->hw, name);
+        clk = ti_clk_register_omap_hw(NULL, &clk_hw->hw, name);
 
-        if (IS_ERR(clk)) {
+        if (IS_ERR(clk))
                 kfree(clk_hw);
-        } else {
-                omap2_init_clk_hw_omap_clocks(&clk_hw->hw);
+        else
                 of_clk_add_provider(node, of_clk_src_simple_get, clk);
-        }
 }
 #endif
 
diff --git a/drivers/clk/ti/gate.c b/drivers/clk/ti/gate.c
index 1c78fff5513c..504c0e91cdc7 100644
--- a/drivers/clk/ti/gate.c
+++ b/drivers/clk/ti/gate.c
@@ -123,7 +123,7 @@ static struct clk *_register_gate(struct device *dev, const char *name,
 
         init.flags = flags;
 
-        clk = ti_clk_register(NULL, &clk_hw->hw, name);
+        clk = ti_clk_register_omap_hw(NULL, &clk_hw->hw, name);
 
         if (IS_ERR(clk))
                 kfree(clk_hw);
diff --git a/drivers/clk/ti/interface.c b/drivers/clk/ti/interface.c
index 87e00c2ee957..83e34429d3b1 100644
--- a/drivers/clk/ti/interface.c
+++ b/drivers/clk/ti/interface.c
@@ -57,12 +57,10 @@ static struct clk *_register_interface(struct device *dev, const char *name,
         init.num_parents = 1;
         init.parent_names = &parent_name;
 
-        clk = ti_clk_register(NULL, &clk_hw->hw, name);
+        clk = ti_clk_register_omap_hw(NULL, &clk_hw->hw, name);
 
         if (IS_ERR(clk))
                 kfree(clk_hw);
-        else
-                omap2_init_clk_hw_omap_clocks(&clk_hw->hw);
 
         return clk;
 }