1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/clk/bcm/clk-iproc-armpll.c b/drivers/clk/bcm/clk-iproc-armpll.c
index a196ee28a17a..d7d628214b85 100644
--- a/drivers/clk/bcm/clk-iproc-armpll.c
+++ b/drivers/clk/bcm/clk-iproc-armpll.c
@@ -20,6 +20,8 @@
 #include <linux/clkdev.h>
 #include <linux/of_address.h>
 
+#include "clk-iproc.h"
+
 #define IPROC_CLK_MAX_FREQ_POLICY                    0x3
 #define IPROC_CLK_POLICY_FREQ_OFFSET                 0x008
 #define IPROC_CLK_POLICY_FREQ_POLICY_FREQ_SHIFT      8
@@ -242,7 +244,6 @@ static const struct clk_ops iproc_arm_pll_ops = {
 void __init iproc_armpll_setup(struct device_node *node)
 {
         int ret;
-        struct clk *clk;
         struct iproc_arm_pll *pll;
         struct clk_init_data init;
         const char *parent_name;
@@ -263,18 +264,18 @@ void __init iproc_armpll_setup(struct device_node *node)
         init.num_parents = (parent_name ? 1 : 0);
         pll->hw.init = &init;
 
-        clk = clk_register(NULL, &pll->hw);
-        if (WARN_ON(IS_ERR(clk)))
+        ret = clk_hw_register(NULL, &pll->hw);
+        if (WARN_ON(ret))
                 goto err_iounmap;
 
-        ret = of_clk_add_provider(node, of_clk_src_simple_get, clk);
+        ret = of_clk_add_hw_provider(node, of_clk_hw_simple_get, &pll->hw);
         if (WARN_ON(ret))
                 goto err_clk_unregister;
 
         return;
 
 err_clk_unregister:
-        clk_unregister(clk);
+        clk_hw_unregister(&pll->hw);
 err_iounmap:
         iounmap(pll->base);
 err_free_pll: