diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-18 11:49:17 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-18 11:49:17 +1000 |
| commit | edc0e258e9f2da90ebc47ad1909502c24ac236a9 (patch) | |
| tree | bf5e225457338c810ef8db42c25730d9ae4dcc0f /arch/arm/mach-mvebu/platsmp.c | |
| parent | e329696c55e5a58ce4fc7047f2c2f6bee84e0329 (diff) | |
| parent | 0ed00aa0e60b8ff925e749ce292b0886ece379c7 (diff) | |
Merge remote-tracking branch 'mvebu/for-next'
Conflicts:
arch/arm/Kconfig
arch/arm/mach-mvebu/headsmp-a9.S
drivers/cpuidle/cpuidle-armada-370-xp.c
Diffstat (limited to 'arch/arm/mach-mvebu/platsmp.c')
| -rw-r--r-- | arch/arm/mach-mvebu/platsmp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/platsmp.c b/arch/arm/mach-mvebu/platsmp.c index b6fa9f0c98b8..895dc373c8a1 100644 --- a/arch/arm/mach-mvebu/platsmp.c +++ b/arch/arm/mach-mvebu/platsmp.c @@ -67,6 +67,7 @@ static void __init set_secondary_cpus_clock(void) if (!cpu_clk) return; clk_set_rate(cpu_clk, rate); + clk_prepare_enable(cpu_clk); } } @@ -108,7 +109,7 @@ static int armada_xp_boot_secondary(unsigned int cpu, struct task_struct *idle) */ static void armada_xp_secondary_init(unsigned int cpu) { - armada_370_xp_pmsu_idle_exit(); + mvebu_v7_pmsu_idle_exit(); } static void __init armada_xp_smp_init_cpus(void) |