These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / clk / clk-cdce706.c

diff --git a/kernel/drivers/clk/clk-cdce706.c b/kernel/drivers/clk/clk-cdce706.c
index b8e4f8a..01877f6 100644 (file)
--- a/kernel/drivers/clk/clk-cdce706.c
+++ b/kernel/drivers/clk/clk-cdce706.c
@@ -10,6 +10,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/delay.h>
 #include <linux/i2c.h>
@@ -94,7 +95,7 @@ static const char * const cdce706_source_name[] = {
        "clk_in0", "clk_in1",
 };
 
-static const char *cdce706_clkin_name[] = {
+static const char * const cdce706_clkin_name[] = {
        "clk_in",
 };
 
@@ -102,7 +103,7 @@ static const char * const cdce706_pll_name[] = {
        "pll1", "pll2", "pll3",
 };
 
-static const char *cdce706_divider_parent_name[] = {
+static const char * const cdce706_divider_parent_name[] = {
        "clk_in", "pll1", "pll2", "pll2", "pll3",
 };
 
@@ -309,7 +310,7 @@ static long cdce706_divider_round_rate(struct clk_hw *hw, unsigned long rate,
        if (!mul)
                div = CDCE706_DIVIDER_DIVIDER_MAX;
 
-       if (__clk_get_flags(hw->clk) & CLK_SET_RATE_PARENT) {
+       if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) {
                unsigned long best_diff = rate;
                unsigned long best_div = 0;
                struct clk *gp_clk = cdce->clkin_clk[cdce->clkin[0].parent];
@@ -666,6 +667,7 @@ static int cdce706_probe(struct i2c_client *client,
 
 static int cdce706_remove(struct i2c_client *client)
 {
+       of_clk_del_provider(client->dev.of_node);
        return 0;
 }