Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[karo-tx-linux.git] / arch / arm / mach-omap2 / clock.c

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 1270afdcacdf89c9b8fa8e76d3826f3ddb8e8aff..42881f21cede1659fbe3518ad0da1df2d42f96d9 100644 (file)
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -54,9 +54,10 @@ u16 cpu_mask;
 #define OMAP3PLUS_DPLL_FINT_MIN                32000
 #define OMAP3PLUS_DPLL_FINT_MAX                52000000
 
-static struct ti_clk_ll_ops omap_clk_ll_ops = {
+struct ti_clk_ll_ops omap_clk_ll_ops = {
        .clkdm_clk_enable = clkdm_clk_enable,
        .clkdm_clk_disable = clkdm_clk_disable,
+       .clkdm_lookup = clkdm_lookup,
        .cm_wait_module_ready = omap_cm_wait_module_ready,
        .cm_split_idlest_reg = cm_split_idlest_reg,
 };
@@ -78,38 +79,6 @@ int __init omap2_clk_setup_ll_ops(void)
  * OMAP2+ specific clock functions
  */
 
-/* Public functions */
-
-/**
- * omap2_init_clk_clkdm - look up a clockdomain name, store pointer in clk
- * @clk: OMAP clock struct ptr to use
- *
- * Convert a clockdomain name stored in a struct clk 'clk' into a
- * clockdomain pointer, and save it into the struct clk.  Intended to be
- * called during clk_register().  No return value.
- */
-void omap2_init_clk_clkdm(struct clk_hw *hw)
-{
-       struct clk_hw_omap *clk = to_clk_hw_omap(hw);
-       struct clockdomain *clkdm;
-       const char *clk_name;
-
-       if (!clk->clkdm_name)
-               return;
-
-       clk_name = __clk_get_name(hw->clk);
-
-       clkdm = clkdm_lookup(clk->clkdm_name);
-       if (clkdm) {
-               pr_debug("clock: associated clk %s to clkdm %s\n",
-                        clk_name, clk->clkdm_name);
-               clk->clkdm = clkdm;
-       } else {
-               pr_debug("clock: could not associate clk %s to clkdm %s\n",
-                        clk_name, clk->clkdm_name);
-       }
-}
-
 /**
  * ti_clk_init_features - init clock features struct for the SoC
  *