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: Haojian Zhuang <haojian.zhuang@linaro.org>
Acked-by: Wei Xu <xuwei5@hisilicon.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/boot/dts/hi3620.dtsi b/arch/arm/boot/dts/hi3620.dtsi
index ab1116d086be82bc405f599cd3f2677a749fae42..a7b0d3d72adb66cad846b9fa05bc29be774a5d78 100644 (file)
--- a/arch/arm/boot/dts/hi3620.dtsi
+++ b/arch/arm/boot/dts/hi3620.dtsi
@@ -33,6 +33,7 @@ pclk: clk {
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
+               enable-method = "hisilicon,hi3620-smp";
 
                cpu@0 {
                        device_type = "cpu";

diff --git a/arch/arm/boot/dts/hisi-x5hd2-dkb.dts b/arch/arm/boot/dts/hisi-x5hd2-dkb.dts
index 9eafb7b00a268bd66b037270bb92c9ab72d9465a..05b44c272c9a7b11cd05f64ac1879dc128fe035d 100644 (file)
--- a/arch/arm/boot/dts/hisi-x5hd2-dkb.dts
+++ b/arch/arm/boot/dts/hisi-x5hd2-dkb.dts
@@ -21,6 +21,7 @@ chosen {
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
+               enable-method = "hisilicon,hix5hd2-smp";
 
                cpu@0 {
                        compatible = "arm,cortex-a9";

diff --git a/arch/arm/mach-hisi/hisilicon.c b/arch/arm/mach-hisi/hisilicon.c
index 7996c6b7433906586b68150ff41a16cc810f388e..7cda6dda3cd000a2c89bab157ff83d03ad6d9bdb 100644 (file)
--- a/arch/arm/mach-hisi/hisilicon.c
+++ b/arch/arm/mach-hisi/hisilicon.c
@@ -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

diff --git a/arch/arm/mach-hisi/platsmp.c b/arch/arm/mach-hisi/platsmp.c
index ecf7058d5c158a9c01742fb6deb8b803c224fbf8..575dd8285f1fb67b6a7789f8fd27a1613692daf0 100644 (file)
--- a/arch/arm/mach-hisi/platsmp.c
+++ b/arch/arm/mach-hisi/platsmp.c
@@ -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);