Commit f6cec7cd authored by Sudeep KarkadaNagesha's avatar Sudeep KarkadaNagesha
Browse files

ARM: mvebu: remove device tree parsing for cpu nodes 



Currently set_secondary_cpus_clock assume the CPU logical ordering
and the MPDIR in DT are same, which is incorrect.

Since the CPU device nodes can be retrieved in the logical ordering
using the DT helper, we can remove the devices tree parsing.

This patch removes DT parsing by making use of of_get_cpu_node.

Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Jason Cooper <jason@lakedaemon.net>
Acked-by: default avatarGregory Clement <gregory.clement@free-electrons.com>
Signed-off-by: default avatarSudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
parent 816a8de0

arch/arm/mach-mvebu/platsmp.c

+23 −28
Original line number Diff line number Diff line
@@ -29,47 +29,42 @@ 
#include "pmsu.h"

#include "coherency.h"



static struct clk *__init get_cpu_clk(int cpu)

{

	struct clk *cpu_clk;

	struct device_node *np = of_get_cpu_node(cpu, NULL);



	if (WARN(!np, "missing cpu node\n"))

		return NULL;

	cpu_clk = of_clk_get(np, 0);

	if (WARN_ON(IS_ERR(cpu_clk)))

		return NULL;

	return cpu_clk;

}



void __init set_secondary_cpus_clock(void)

{

	int thiscpu;

	int thiscpu, cpu;

	unsigned long rate;

	struct clk *cpu_clk = NULL;

	struct device_node *np = NULL;

	struct clk *cpu_clk;



	thiscpu = smp_processor_id();

	for_each_node_by_type(np, "cpu") {

		int err;

		int cpu;



		err = of_property_read_u32(np, "reg", &cpu);

		if (WARN_ON(err))

			return;



		if (cpu == thiscpu) {

			cpu_clk = of_clk_get(np, 0);

			break;

		}

	}

	if (WARN_ON(IS_ERR(cpu_clk)))

	cpu_clk = get_cpu_clk(thiscpu);

	if (!cpu_clk)

		return;

	clk_prepare_enable(cpu_clk);

	rate = clk_get_rate(cpu_clk);



	/* set all the other CPU clk to the same rate than the boot CPU */

	for_each_node_by_type(np, "cpu") {

		int err;

		int cpu;



		err = of_property_read_u32(np, "reg", &cpu);

		if (WARN_ON(err))

	for_each_possible_cpu(cpu) {

		if (cpu == thiscpu)

			continue;

		cpu_clk = get_cpu_clk(cpu);

		if (!cpu_clk)

			return;



		if (cpu != thiscpu) {

			cpu_clk = of_clk_get(np, 0);

		clk_set_rate(cpu_clk, rate);

	}

}

}



static void armada_xp_secondary_init(unsigned int cpu)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE