From cd4b2b9bc239ec93fd1883327e71a6748d06cbff Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 18 Apr 2014 21:01:50 +0200 Subject: ARM: sun6i: Use CPU_METHOD_OF_DECLARE CPU_METHOD_OF_DECLARE allows to bind the smp_ops to a set of cpus through the enable-method property, instead of relying on the machine to define it. Switch to it to get closer to an empty machine. Signed-off-by: Maxime Ripard --- arch/arm/mach-sunxi/platsmp.c | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/mach-sunxi/platsmp.c') diff --git a/arch/arm/mach-sunxi/platsmp.c b/arch/arm/mach-sunxi/platsmp.c index 0c7dbce033cc..828f21126973 100644 --- a/arch/arm/mach-sunxi/platsmp.c +++ b/arch/arm/mach-sunxi/platsmp.c @@ -122,3 +122,4 @@ struct smp_operations sun6i_smp_ops __initdata = { .smp_prepare_cpus = sun6i_smp_prepare_cpus, .smp_boot_secondary = sun6i_smp_boot_secondary, }; +CPU_METHOD_OF_DECLARE(sun6i_smp, "allwinner,sun6i-a31", &sun6i_smp_ops); -- cgit v1.2.3 From 27a3cf055fcfe2dff9c59f424e9342f1a2d09023 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 18 Apr 2014 21:01:53 +0200 Subject: ARM: sun6i: Retire the smp field in A31 machine Now that we can rely on the enable-method, remove the smp field declaration from A31 machine. Signed-off-by: Maxime Ripard --- arch/arm/mach-sunxi/platsmp.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'arch/arm/mach-sunxi/platsmp.c') diff --git a/arch/arm/mach-sunxi/platsmp.c b/arch/arm/mach-sunxi/platsmp.c index 828f21126973..c53077bb8c3f 100644 --- a/arch/arm/mach-sunxi/platsmp.c +++ b/arch/arm/mach-sunxi/platsmp.c @@ -21,8 +21,6 @@ #include #include -#include "common.h" - #define CPUCFG_CPU_PWR_CLAMP_STATUS_REG(cpu) ((cpu) * 0x40 + 0x64) #define CPUCFG_CPU_RST_CTRL_REG(cpu) (((cpu) + 1) * 0x40) #define CPUCFG_CPU_CTRL_REG(cpu) (((cpu) + 1) * 0x40 + 0x04) -- cgit v1.2.3