Merge branch 'socfpga/soc' into next/soc

* socfpga/soc:
ARM: socfpga: fix build error due to secondary_startup

arch/arm/mach-socfpga/platsmp.c

···
 		       SOCFPGA_A10_RSTMGR_MODMPURST);
 		memcpy(phys_to_virt(0), &secondary_trampoline, trampoline_size);
 
-		writel(virt_to_phys(socfpga_secondary_startup),
+		writel(virt_to_phys(secondary_startup),
 		       sys_manager_base_addr + (socfpga_cpu1start_addr & 0x00000fff));
 
 		flush_cache_all();