evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: socfpga: use CPU_METHOD_OF_DECLARE for socfpga_cyclone5

Browse source 
Convert cyclone5/arria5 to use CPU_METHOD_OF_DECLARE for smp operations.

Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
This commit is contained in:
Dinh Nguyen 2015-06-02 21:14:01 -05:00 • committed by Kevin Hilman
parent 122694a0c7
commit 5f763ef80d
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/mach-socfpga/core.h
View file

@ -39,7 +39,6 @@ extern void socfpga_sysmgr_init(void);
extern void __iomem *sys_manager_base_addr; extern void __iomem *sys_manager_base_addr;
extern void __iomem *rst_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 char secondary_trampoline, secondary_trampoline_end;
extern unsigned long socfpga_cpu1start_addr; extern unsigned long socfpga_cpu1start_addr;

4
arch/arm/mach-socfpga/platsmp.c
View file

@ -83,10 +83,12 @@ static void socfpga_cpu_die(unsigned int cpu)
cpu_do_idle(); 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_prepare_cpus = socfpga_smp_prepare_cpus,
.smp_boot_secondary = socfpga_boot_secondary, .smp_boot_secondary = socfpga_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
.cpu_die = socfpga_cpu_die, .cpu_die = socfpga_cpu_die,
#endif #endif
}; };
CPU_METHOD_OF_DECLARE(socfpga_smp, "altr,socfpga-smp", &socfpga_smp_ops);

1
arch/arm/mach-socfpga/socfpga.c
View file

@ -78,7 +78,6 @@ static const char *altera_dt_match[] = {
DT_MACHINE_START(SOCFPGA, "Altera SOCFPGA") DT_MACHINE_START(SOCFPGA, "Altera SOCFPGA")
.l2c_aux_val = 0, .l2c_aux_val = 0,
.l2c_aux_mask = ~0, .l2c_aux_mask = ~0,
.smp = smp_ops(socfpga_smp_ops),
.init_irq = socfpga_init_irq, .init_irq = socfpga_init_irq,
.restart = socfpga_cyclone5_restart, .restart = socfpga_cyclone5_restart,
.dt_compat = altera_dt_match, .dt_compat = altera_dt_match,