diff options
Diffstat (limited to 'kernel/drivers/clk/mvebu')
| -rw-r--r-- | kernel/drivers/clk/mvebu/armada-370.c | 1 | ||||
| -rw-r--r-- | kernel/drivers/clk/mvebu/clk-cpu.c | 9 | ||||
| -rw-r--r-- | kernel/drivers/clk/mvebu/common.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kernel/drivers/clk/mvebu/armada-370.c b/kernel/drivers/clk/mvebu/armada-370.c index 756f0f39d..2c7c1085f 100644 --- a/kernel/drivers/clk/mvebu/armada-370.c +++ b/kernel/drivers/clk/mvebu/armada-370.c @@ -163,6 +163,7 @@ static const struct clk_gating_soc_desc a370_gating_desc[] __initconst = { { "pex1", "pex1_en", 9, 0 }, { "sata0", NULL, 15, 0 }, { "sdio", NULL, 17, 0 }, + { "crypto", NULL, 23, CLK_IGNORE_UNUSED }, { "tdm", NULL, 25, 0 }, { "ddr", NULL, 28, CLK_IGNORE_UNUSED }, { "sata1", NULL, 30, 0 }, diff --git a/kernel/drivers/clk/mvebu/clk-cpu.c b/kernel/drivers/clk/mvebu/clk-cpu.c index 3821a8807..5837eb8a2 100644 --- a/kernel/drivers/clk/mvebu/clk-cpu.c +++ b/kernel/drivers/clk/mvebu/clk-cpu.c @@ -10,7 +10,8 @@ * warranty of any kind, whether express or implied. */ #include <linux/kernel.h> -#include <linux/clkdev.h> +#include <linux/slab.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/of_address.h> #include <linux/io.h> @@ -120,7 +121,7 @@ static int clk_cpu_on_set_rate(struct clk_hw *hwclk, unsigned long rate, if (!cpuclk->pmu_dfs) return -ENODEV; - cur_rate = __clk_get_rate(hwclk->clk); + cur_rate = clk_hw_get_rate(hwclk); reg = readl(cpuclk->reg_base + SYS_CTRL_CLK_DIVIDER_CTRL2_OFFSET); fabric_div = (reg >> SYS_CTRL_CLK_DIVIDER_CTRL2_NBCLK_RATIO_SHIFT) & @@ -196,7 +197,6 @@ static void __init of_cpu_clk_setup(struct device_node *node) for_each_node_by_type(dn, "cpu") { struct clk_init_data init; struct clk *clk; - struct clk *parent_clk; char *clk_name = kzalloc(5, GFP_KERNEL); int cpu, err; @@ -208,9 +208,8 @@ static void __init of_cpu_clk_setup(struct device_node *node) goto bail_out; sprintf(clk_name, "cpu%d", cpu); - parent_clk = of_clk_get(node, 0); - cpuclk[cpu].parent_name = __clk_get_name(parent_clk); + cpuclk[cpu].parent_name = of_clk_get_parent_name(node, 0); cpuclk[cpu].clk_name = clk_name; cpuclk[cpu].cpu = cpu; cpuclk[cpu].reg_base = clock_complex_base; diff --git a/kernel/drivers/clk/mvebu/common.c b/kernel/drivers/clk/mvebu/common.c index 15b370ff3..28aac67e7 100644 --- a/kernel/drivers/clk/mvebu/common.c +++ b/kernel/drivers/clk/mvebu/common.c @@ -13,8 +13,8 @@ */ #include <linux/kernel.h> +#include <linux/slab.h> #include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/io.h> #include <linux/of.h> @@ -165,7 +165,7 @@ void __init mvebu_coreclk_setup(struct device_node *np, clk_data.clks[2+n] = clk_register_fixed_factor(NULL, rclk_name, cpuclk_name, 0, mult, div); WARN_ON(IS_ERR(clk_data.clks[2+n])); - }; + } /* Register optional refclk */ if (desc->get_refclk_freq) { |