Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27a3cf05 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

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: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent 913627b3

arch/arm/mach-sunxi/common.h

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
/*

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

arch/arm/mach-sunxi/platsmp.c

+0 −2
Original line number Diff line number Diff line
@@ -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)

arch/arm/mach-sunxi/sunxi.c

+0 −3
Original line number Diff line number Diff line
@@ -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[] = {