aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2015-10-16 19:35:11 -0400
committerStephen Boyd <sboyd@codeaurora.org>2015-10-16 19:35:43 -0400
commit61e22fff6475448b8e9d3e45f0bab40bae761c96 (patch)
treec0a21d7f37cfdf0d3b927136bc285e2deaf77476
parent5532cfb567fec4ebb9775481ef121edb340ec5b8 (diff)
clk: mvebu: Use of_clk_get_parent_name()
This reverts commit e79b202c632f24f49f2eb9459b88b5fd9e332263. Now that we use of_clk_get() inside of_clk_get_parent_name() we can safely use it here. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
-rw-r--r--drivers/clk/mvebu/clk-cpu.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/clk/mvebu/clk-cpu.c b/drivers/clk/mvebu/clk-cpu.c
index 85da8b983256..5837eb8a212f 100644
--- a/drivers/clk/mvebu/clk-cpu.c
+++ b/drivers/clk/mvebu/clk-cpu.c
@@ -197,7 +197,6 @@ static void __init of_cpu_clk_setup(struct device_node *node)
197 for_each_node_by_type(dn, "cpu") { 197 for_each_node_by_type(dn, "cpu") {
198 struct clk_init_data init; 198 struct clk_init_data init;
199 struct clk *clk; 199 struct clk *clk;
200 struct clk *parent_clk;
201 char *clk_name = kzalloc(5, GFP_KERNEL); 200 char *clk_name = kzalloc(5, GFP_KERNEL);
202 int cpu, err; 201 int cpu, err;
203 202
@@ -209,9 +208,8 @@ static void __init of_cpu_clk_setup(struct device_node *node)
209 goto bail_out; 208 goto bail_out;
210 209
211 sprintf(clk_name, "cpu%d", cpu); 210 sprintf(clk_name, "cpu%d", cpu);
212 parent_clk = of_clk_get(node, 0);
213 211
214 cpuclk[cpu].parent_name = __clk_get_name(parent_clk); 212 cpuclk[cpu].parent_name = of_clk_get_parent_name(node, 0);
215 cpuclk[cpu].clk_name = clk_name; 213 cpuclk[cpu].clk_name = clk_name;
216 cpuclk[cpu].cpu = cpu; 214 cpuclk[cpu].cpu = cpu;
217 cpuclk[cpu].reg_base = clock_complex_base; 215 cpuclk[cpu].reg_base = clock_complex_base;