Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fix from Stephen Boyd:
"Just one revert for Armada XP devices: the conversion to
of_clk_get_parent_name() wasn't a direct translation, so we
revert back to of_clk_get() + __clk_get_name().
We could make of_clk_get_parent_name() more robust, but that
may have unintended side-effects, so we'll do that in the
next version"
* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
Partially revert "clk: mvebu: Convert to clk_hw based provider APIs"
+3
-1
+3
-1
drivers/clk/mvebu/clk-cpu.c
+3
-1
drivers/clk/mvebu/clk-cpu.c
···
197
197
for_each_node_by_type(dn, "cpu") {
198
198
struct clk_init_data init;
199
199
struct clk *clk;
200
+
struct clk *parent_clk;
200
201
char *clk_name = kzalloc(5, GFP_KERNEL);
201
202
int cpu, err;
202
203
···
209
208
goto bail_out;
210
209
211
210
sprintf(clk_name, "cpu%d", cpu);
211
+
parent_clk = of_clk_get(node, 0);
212
212
213
-
cpuclk[cpu].parent_name = of_clk_get_parent_name(node, 0);
213
+
cpuclk[cpu].parent_name = __clk_get_name(parent_clk);
214
214
cpuclk[cpu].clk_name = clk_name;
215
215
cpuclk[cpu].cpu = cpu;
216
216
cpuclk[cpu].reg_base = clock_complex_base;