Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 087a920d authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-fixes' into clk-next 

* clk-fixes:
  Partially revert "clk: mvebu: Convert to clk_hw based provider APIs"
parents 2445a9c5 e79b202c

drivers/clk/mvebu/clk-cpu.c

+3 −1
Original line number Diff line number Diff line
@@ -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;