diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-04-18 21:01:53 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-05-17 18:42:05 +0200 |
| commit | 27a3cf055fcfe2dff9c59f424e9342f1a2d09023 (patch) | |
| tree | 11eefa596429e5ede0c251ac225ad1d0cf4df53c /arch/arm/mach-sunxi | |
| parent | 913627b314b48e867721e3b3c4cfdcb1bda1307d (diff) | |
| download | op-kernel-dev-27a3cf055fcfe2dff9c59f424e9342f1a2d09023.zip op-kernel-dev-27a3cf055fcfe2dff9c59f424e9342f1a2d09023.tar.gz | |
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 <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm/mach-sunxi')
| -rw-r--r-- | arch/arm/mach-sunxi/common.h | 19 | ||||
| -rw-r--r-- | arch/arm/mach-sunxi/platsmp.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-sunxi/sunxi.c | 3 |
3 files changed, 0 insertions, 24 deletions
diff --git a/arch/arm/mach-sunxi/common.h b/arch/arm/mach-sunxi/common.h deleted file mode 100644 index 9e5ac47..0000000 --- a/arch/arm/mach-sunxi/common.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Core functions for Allwinner SoCs - * - * Copyright (C) 2013 Maxime Ripard - * - * Maxime Ripard <maxime.ripard@free-electrons.com> - * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - */ - -#ifndef __ARCH_SUNXI_COMMON_H_ -#define __ARCH_SUNXI_COMMON_H_ - -void sun6i_secondary_startup(void); -extern struct smp_operations sun6i_smp_ops; - -#endif /* __ARCH_SUNXI_COMMON_H_ */ diff --git a/arch/arm/mach-sunxi/platsmp.c b/arch/arm/mach-sunxi/platsmp.c index 828f211..c53077b 100644 --- a/arch/arm/mach-sunxi/platsmp.c +++ b/arch/arm/mach-sunxi/platsmp.c @@ -21,8 +21,6 @@ #include <linux/of_address.h> #include <linux/smp.h> -#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) diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c index 460b5a4..df906e3 100644 --- a/arch/arm/mach-sunxi/sunxi.c +++ b/arch/arm/mach-sunxi/sunxi.c @@ -25,8 +25,6 @@ #include <asm/mach/map.h> #include <asm/system_misc.h> -#include "common.h" - #define SUN4I_WATCHDOG_CTRL_REG 0x00 #define SUN4I_WATCHDOG_CTRL_RESTART BIT(0) #define SUN4I_WATCHDOG_MODE_REG 0x04 @@ -149,7 +147,6 @@ DT_MACHINE_START(SUN6I_DT, "Allwinner sun6i (A31) Family") .init_time = sun6i_timer_init, .dt_compat = sun6i_board_dt_compat, .restart = sun6i_restart, - .smp = smp_ops(sun6i_smp_ops), MACHINE_END static const char * const sun7i_board_dt_compat[] = { |
