| From 1fae7a42aeedf37fb99d9757afce4a080bbcae68 Mon Sep 17 00:00:00 2001 |
| From: Dinh Nguyen <dinguyen@opensource.altera.com> |
| Date: Tue, 2 Jun 2015 21:14:01 -0500 |
| Subject: [PATCH 19/39] 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: Dinh Nguyen <dinguyen@opensource.altera.com> |
| Signed-off-by: Kevin Hilman <khilman@linaro.org> |
| (cherry picked from commit 5f763ef80d4dff7f2aa519a31472b03499e2c2e1) |
| Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> |
| --- |
| arch/arm/mach-socfpga/core.h | 1 - |
| arch/arm/mach-socfpga/platsmp.c | 4 +++- |
| arch/arm/mach-socfpga/socfpga.c | 1 - |
| 3 files changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/arch/arm/mach-socfpga/core.h |
| +++ b/arch/arm/mach-socfpga/core.h |
| @@ -37,7 +37,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; |
| --- a/arch/arm/mach-socfpga/platsmp.c |
| +++ b/arch/arm/mach-socfpga/platsmp.c |
| @@ -83,10 +83,12 @@ static void socfpga_cpu_die(unsigned int |
| 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); |
| --- a/arch/arm/mach-socfpga/socfpga.c |
| +++ b/arch/arm/mach-socfpga/socfpga.c |
| @@ -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, |