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>
This commit is contained in:
Maxime Ripard 2014-04-18 21:01:53 +02:00
Родитель 913627b314
Коммит 27a3cf055f
3 изменённых файлов: 0 добавлений и 24 удалений

Просмотреть файл

@ -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_ */

Просмотреть файл

@ -21,8 +21,6 @@
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/smp.h> #include <linux/smp.h>
#include "common.h"
#define CPUCFG_CPU_PWR_CLAMP_STATUS_REG(cpu) ((cpu) * 0x40 + 0x64) #define CPUCFG_CPU_PWR_CLAMP_STATUS_REG(cpu) ((cpu) * 0x40 + 0x64)
#define CPUCFG_CPU_RST_CTRL_REG(cpu) (((cpu) + 1) * 0x40) #define CPUCFG_CPU_RST_CTRL_REG(cpu) (((cpu) + 1) * 0x40)
#define CPUCFG_CPU_CTRL_REG(cpu) (((cpu) + 1) * 0x40 + 0x04) #define CPUCFG_CPU_CTRL_REG(cpu) (((cpu) + 1) * 0x40 + 0x04)

Просмотреть файл

@ -25,8 +25,6 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/system_misc.h> #include <asm/system_misc.h>
#include "common.h"
#define SUN4I_WATCHDOG_CTRL_REG 0x00 #define SUN4I_WATCHDOG_CTRL_REG 0x00
#define SUN4I_WATCHDOG_CTRL_RESTART BIT(0) #define SUN4I_WATCHDOG_CTRL_RESTART BIT(0)
#define SUN4I_WATCHDOG_MODE_REG 0x04 #define SUN4I_WATCHDOG_MODE_REG 0x04
@ -149,7 +147,6 @@ DT_MACHINE_START(SUN6I_DT, "Allwinner sun6i (A31) Family")
.init_time = sun6i_timer_init, .init_time = sun6i_timer_init,
.dt_compat = sun6i_board_dt_compat, .dt_compat = sun6i_board_dt_compat,
.restart = sun6i_restart, .restart = sun6i_restart,
.smp = smp_ops(sun6i_smp_ops),
MACHINE_END MACHINE_END
static const char * const sun7i_board_dt_compat[] = { static const char * const sun7i_board_dt_compat[] = {