summaryrefslogtreecommitdiff
path: root/drivers/clk/mvebu
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2015-10-16 02:13:50 +0300
committerStephen Boyd <sboyd@codeaurora.org>2015-10-16 02:13:50 +0300
commit087a920d4a3e33285f93a0ae7607f71095ffe601 (patch)
tree1cc4848f0b8840f3b94790088b8f509099b7f623 /drivers/clk/mvebu
parent2445a9c5f0de77377da2c7e7163be8488b3d6e7b (diff)
parente79b202c632f24f49f2eb9459b88b5fd9e332263 (diff)
downloadlinux-087a920d4a3e33285f93a0ae7607f71095ffe601.tar.xz
Merge branch 'clk-fixes' into clk-next
* clk-fixes: Partially revert "clk: mvebu: Convert to clk_hw based provider APIs"
Diffstat (limited to 'drivers/clk/mvebu')
-rw-r--r--drivers/clk/mvebu/clk-cpu.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/clk/mvebu/clk-cpu.c b/drivers/clk/mvebu/clk-cpu.c
index 5837eb8a212f..85da8b983256 100644
--- a/drivers/clk/mvebu/clk-cpu.c
+++ b/drivers/clk/mvebu/clk-cpu.c
@@ -197,6 +197,7 @@ 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,8 +209,9 @@ 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 = of_clk_get_parent_name(node, 0);
+ cpuclk[cpu].parent_name = __clk_get_name(parent_clk);
cpuclk[cpu].clk_name = clk_name;
cpuclk[cpu].cpu = cpu;
cpuclk[cpu].reg_base = clock_complex_base;