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

Commit c2fff85e authored by Haojian Zhuang's avatar Haojian Zhuang Committed by Olof Johansson
Browse files

ARM: hisi: remove smp from machine descriptor 



Use CPU_METHOD_OF_DECLARE() instead. And declare smp method in dts file.

Changelog:
v6:
  * Use hisilicon,hi3620-smp as enable-method property in Hi3620 dts.

Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@linaro.org>
Acked-by: default avatarWei Xu <xuwei5@hisilicon.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 4a9b3737

arch/arm/boot/dts/hi3620.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
	cpus {

		#address-cells = <1>;

		#size-cells = <0>;

		enable-method = "hisilicon,hi3620-smp";



		cpu@0 {

			device_type = "cpu";

arch/arm/boot/dts/hisi-x5hd2-dkb.dts

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
	cpus {

		#address-cells = <1>;

		#size-cells = <0>;

		enable-method = "hisilicon,hix5hd2-smp";



		cpu@0 {

			compatible = "arm,cortex-a9";

arch/arm/mach-hisi/hisilicon.c

+0 −4
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/map.h>



#include "core.h"



#define HI3620_SYSCTRL_PHYS_BASE		0xfc802000

#define HI3620_SYSCTRL_VIRT_BASE		0xfe802000
@@ -55,7 +53,6 @@ static const char *hi3xxx_compat[] __initconst = { 
DT_MACHINE_START(HI3620, "Hisilicon Hi3620 (Flattened Device Tree)")

	.map_io		= hi3620_map_io,

	.dt_compat	= hi3xxx_compat,

	.smp		= smp_ops(hi3xxx_smp_ops),

MACHINE_END



static const char *hix5hd2_compat[] __initconst = {
@@ -65,5 +62,4 @@ static const char *hix5hd2_compat[] __initconst = { 


DT_MACHINE_START(HIX5HD2_DT, "Hisilicon HIX5HD2 (Flattened Device Tree)")

	.dt_compat	= hix5hd2_compat,

	.smp		= smp_ops(hix5hd2_smp_ops),

MACHINE_END

arch/arm/mach-hisi/platsmp.c

+3 −0
Original line number Diff line number Diff line
@@ -131,3 +131,6 @@ struct smp_operations hix5hd2_smp_ops __initdata = { 
	.cpu_die		= hix5hd2_cpu_die,

#endif

};



CPU_METHOD_OF_DECLARE(hi3xxx_smp, "hisilicon,hi3620-smp", &hi3xxx_smp_ops);

CPU_METHOD_OF_DECLARE(hix5hd2_smp, "hisilicon,hix5hd2-smp", &hix5hd2_smp_ops);