Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f763ef8 authored by Dinh Nguyen's avatar Dinh Nguyen Committed by Kevin Hilman
Browse files

ARM: socfpga: use CPU_METHOD_OF_DECLARE for socfpga_cyclone5 



Convert cyclone5/arria5 to use CPU_METHOD_OF_DECLARE for smp operations.

Signed-off-by: default avatarDinh Nguyen <dinguyen@opensource.altera.com>
Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parent 122694a0

arch/arm/mach-socfpga/core.h

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ extern void socfpga_sysmgr_init(void); 
extern void __iomem *sys_manager_base_addr;

extern void __iomem *rst_manager_base_addr;



extern struct smp_operations socfpga_smp_ops;

extern char secondary_trampoline, secondary_trampoline_end;



extern unsigned long socfpga_cpu1start_addr;

arch/arm/mach-socfpga/platsmp.c

+3 −1
Original line number Diff line number Diff line
@@ -83,10 +83,12 @@ static void socfpga_cpu_die(unsigned int cpu) 
		cpu_do_idle();

}



struct smp_operations socfpga_smp_ops __initdata = {

static struct smp_operations socfpga_smp_ops __initdata = {

	.smp_prepare_cpus	= socfpga_smp_prepare_cpus,

	.smp_boot_secondary	= socfpga_boot_secondary,

#ifdef CONFIG_HOTPLUG_CPU

	.cpu_die		= socfpga_cpu_die,

#endif

};



CPU_METHOD_OF_DECLARE(socfpga_smp, "altr,socfpga-smp", &socfpga_smp_ops);

arch/arm/mach-socfpga/socfpga.c

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ static const char *altera_dt_match[] = { 
DT_MACHINE_START(SOCFPGA, "Altera SOCFPGA")

	.l2c_aux_val	= 0,

	.l2c_aux_mask	= ~0,

	.smp		= smp_ops(socfpga_smp_ops),

	.init_irq	= socfpga_init_irq,

	.restart	= socfpga_cyclone5_restart,

	.dt_compat	= altera_dt_match,