1 files changed, 8 insertions, 5 deletions

diff --git a/arch/arm/mach-omap2/dpll3xxx.c b/arch/arm/mach-omap2/dpll3xxx.c
index c2da2a0fe5ad..44e57ec225d4 100644
--- a/arch/arm/mach-omap2/dpll3xxx.c
+++ b/arch/arm/mach-omap2/dpll3xxx.c
@@ -410,7 +410,7 @@ int omap3_noncore_dpll_enable(struct clk_hw *hw)
         struct clk_hw_omap *clk = to_clk_hw_omap(hw);
         int r;
         struct dpll_data *dd;
-        struct clk *parent;
+        struct clk_hw *parent;
 
         dd = clk->dpll_data;
         if (!dd)
@@ -427,13 +427,13 @@ int omap3_noncore_dpll_enable(struct clk_hw *hw)
                 }
         }
 
-        parent = __clk_get_parent(hw->clk);
+        parent = __clk_get_hw(__clk_get_parent(hw->clk));
 
         if (__clk_get_rate(hw->clk) == __clk_get_rate(dd->clk_bypass)) {
-                WARN_ON(parent != dd->clk_bypass);
+                WARN_ON(parent != __clk_get_hw(dd->clk_bypass));
                 r = _omap3_noncore_dpll_bypass(clk);
         } else {
-                WARN_ON(parent != dd->clk_ref);
+                WARN_ON(parent != __clk_get_hw(dd->clk_ref));
                 r = _omap3_noncore_dpll_lock(clk);
         }
 
@@ -473,6 +473,8 @@ void omap3_noncore_dpll_disable(struct clk_hw *hw)
  * in failure.
  */
 long omap3_noncore_dpll_determine_rate(struct clk_hw *hw, unsigned long rate,
+                                       unsigned long min_rate,
+                                       unsigned long max_rate,
                                        unsigned long *best_parent_rate,
                                        struct clk_hw **best_parent_clk)
 {
@@ -549,7 +551,8 @@ int omap3_noncore_dpll_set_rate(struct clk_hw *hw, unsigned long rate,
         if (!dd)
                 return -EINVAL;
 
-        if (__clk_get_parent(hw->clk) != dd->clk_ref)
+        if (__clk_get_hw(__clk_get_parent(hw->clk)) !=
+            __clk_get_hw(dd->clk_ref))
                 return -EINVAL;
 
         if (dd->last_rounded_rate == 0)