Merge tag 'pinctrl-v3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[cascardo/linux.git] / arch / arm / mach-mvebu / platsmp.c

diff --git a/arch/arm/mach-mvebu/platsmp.c b/arch/arm/mach-mvebu/platsmp.c
index 895dc37..58cc8c1 100644 (file)
--- a/arch/arm/mach-mvebu/platsmp.c
+++ b/arch/arm/mach-mvebu/platsmp.c
@@ -30,10 +30,12 @@
 #include "pmsu.h"
 #include "coherency.h"
 
+#define ARMADA_XP_MAX_CPUS 4
+
 #define AXP_BOOTROM_BASE 0xfff00000
 #define AXP_BOOTROM_SIZE 0x100000
 
-static struct clk *__init get_cpu_clk(int cpu)
+static struct clk *get_cpu_clk(int cpu)
 {
        struct clk *cpu_clk;
        struct device_node *np = of_get_cpu_node(cpu, NULL);
@@ -46,29 +48,28 @@ static struct clk *__init get_cpu_clk(int cpu)
        return cpu_clk;
 }
 
-static void __init set_secondary_cpus_clock(void)
+static void set_secondary_cpu_clock(unsigned int cpu)
 {
-       int thiscpu, cpu;
+       int thiscpu;
        unsigned long rate;
        struct clk *cpu_clk;
 
-       thiscpu = smp_processor_id();
+       thiscpu = get_cpu();
+
        cpu_clk = get_cpu_clk(thiscpu);
        if (!cpu_clk)
-               return;
+               goto out;
        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_possible_cpu(cpu) {
-               if (cpu == thiscpu)
-                       continue;
-               cpu_clk = get_cpu_clk(cpu);
-               if (!cpu_clk)
-                       return;
-               clk_set_rate(cpu_clk, rate);
-               clk_prepare_enable(cpu_clk);
-       }
+       cpu_clk = get_cpu_clk(cpu);
+       if (!cpu_clk)
+               goto out;
+       clk_set_rate(cpu_clk, rate);
+       clk_prepare_enable(cpu_clk);
+
+out:
+       put_cpu();
 }
 
 static int armada_xp_boot_secondary(unsigned int cpu, struct task_struct *idle)
@@ -78,6 +79,7 @@ static int armada_xp_boot_secondary(unsigned int cpu, struct task_struct *idle)
        pr_info("Booting CPU %d\n", cpu);
 
        hw_cpu = cpu_logical_map(cpu);
+       set_secondary_cpu_clock(hw_cpu);
        mvebu_pmsu_set_cpu_boot_addr(hw_cpu, armada_xp_secondary_startup);
 
        /*
@@ -126,7 +128,6 @@ static void __init armada_xp_smp_prepare_cpus(unsigned int max_cpus)
        struct resource res;
        int err;
 
-       set_secondary_cpus_clock();
        flush_cache_all();
        set_cpu_coherent();