OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Partially revert "clk: mvebu: Convert to clk_hw based provider APIs"
[uclinux-h8/linux.git]
/
drivers
/
clk
/
mvebu
/
clk-cpu.c
diff --git
a/drivers/clk/mvebu/clk-cpu.c
b/drivers/clk/mvebu/clk-cpu.c
index
5837eb8
..
85da8b9
100644
(file)
--- 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;
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;
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);
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;
cpuclk[cpu].clk_name = clk_name;
cpuclk[cpu].cpu = cpu;
cpuclk[cpu].reg_base = clock_complex_base;