iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: hisi: remove smp from machine descriptor

Browse Source 
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: Haojian Zhuang <haojian.zhuang@linaro.org>
Acked-by: Wei Xu <xuwei5@hisilicon.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Haojian Zhuang 2014-07-28 20:14:32 +08:00 committed by Olof Johansson
parent 4a9b373718
commit c2fff85e21
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/hi3620.dtsi
View File

@ -33,6 +33,7 @@
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
enable-method = "hisilicon,hi3620-smp";
cpu@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";

1
arch/arm/boot/dts/hisi-x5hd2-dkb.dts
View File

@ -21,6 +21,7 @@
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
enable-method = "hisilicon,hix5hd2-smp";
cpu@0 { cpu@0 {
compatible = "arm,cortex-a9"; compatible = "arm,cortex-a9";

4
arch/arm/mach-hisi/hisilicon.c
View File

@ -18,8 +18,6 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include "core.h"
#define HI3620_SYSCTRL_PHYS_BASE 0xfc802000 #define HI3620_SYSCTRL_PHYS_BASE 0xfc802000
#define HI3620_SYSCTRL_VIRT_BASE 0xfe802000 #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)") DT_MACHINE_START(HI3620, "Hisilicon Hi3620 (Flattened Device Tree)")
.map_io = hi3620_map_io, .map_io = hi3620_map_io,
.dt_compat = hi3xxx_compat, .dt_compat = hi3xxx_compat,
.smp = smp_ops(hi3xxx_smp_ops),
MACHINE_END MACHINE_END
static const char *hix5hd2_compat[] __initconst = { 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_MACHINE_START(HIX5HD2_DT, "Hisilicon HIX5HD2 (Flattened Device Tree)")
.dt_compat = hix5hd2_compat, .dt_compat = hix5hd2_compat,
.smp = smp_ops(hix5hd2_smp_ops),
MACHINE_END MACHINE_END

3
arch/arm/mach-hisi/platsmp.c
View File

@ -131,3 +131,6 @@ struct smp_operations hix5hd2_smp_ops __initdata = {
.cpu_die = hix5hd2_cpu_die, .cpu_die = hix5hd2_cpu_die,
#endif #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);