Merge branch 'mvebu/irqchip' into mvebu/soc

diff --cc arch/arm/mach-mvebu/platsmp.c
index e01ae51,e43727f..32bf78e
--- 1/arch/arm/mach-mvebu/platsmp.c
--- 2/arch/arm/mach-mvebu/platsmp.c
+++ b/arch/arm/mach-mvebu/platsmp.c
@@@ -70,24 -70,11 +70,19 @@@ static void __init set_secondary_cpus_c
        }
  }
  
- static void armada_xp_secondary_init(unsigned int cpu)
- {
-       armada_xp_mpic_smp_cpu_init();
- }
- 
  static int armada_xp_boot_secondary(unsigned int cpu, struct task_struct *idle)
  {
 +      int ret, hw_cpu;
 +
        pr_info("Booting CPU %d\n", cpu);
  
 -      armada_xp_boot_cpu(cpu, armada_xp_secondary_startup);
 +      hw_cpu = cpu_logical_map(cpu);
 +      mvebu_pmsu_set_cpu_boot_addr(hw_cpu, armada_xp_secondary_startup);
 +      ret = mvebu_cpu_reset_deassert(hw_cpu);
 +      if (ret) {
 +              pr_warn("unable to boot CPU: %d\n", ret);
 +              return ret;
 +      }
  
        return 0;
  }