ARM: hisi: remove smp from machine descriptor

[cascardo/linux.git] / arch / arm / mach-hisi / hisilicon.c

diff --git a/arch/arm/mach-hisi/hisilicon.c b/arch/arm/mach-hisi/hisilicon.c
index 741faf3..7cda6dd 100644 (file)
--- a/arch/arm/mach-hisi/hisilicon.c
+++ b/arch/arm/mach-hisi/hisilicon.c
@@ -14,16 +14,10 @@
 #include <linux/clk-provider.h>
 #include <linux/clocksource.h>
 #include <linux/irqchip.h>
-#include <linux/of_address.h>
-#include <linux/of_platform.h>
-
-#include <asm/proc-fns.h>
 
 #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
 
@@ -51,32 +45,6 @@ static void __init hi3620_map_io(void)
        iotable_init(hi3620_io_desc, ARRAY_SIZE(hi3620_io_desc));
 }
 
-static void hi3xxx_restart(enum reboot_mode mode, const char *cmd)
-{
-       struct device_node *np;
-       void __iomem *base;
-       int offset;
-
-       np = of_find_compatible_node(NULL, NULL, "hisilicon,sysctrl");
-       if (!np) {
-               pr_err("failed to find hisilicon,sysctrl node\n");
-               return;
-       }
-       base = of_iomap(np, 0);
-       if (!base) {
-               pr_err("failed to map address in hisilicon,sysctrl node\n");
-               return;
-       }
-       if (of_property_read_u32(np, "reboot-offset", &offset) < 0) {
-               pr_err("failed to find reboot-offset property\n");
-               return;
-       }
-       writel_relaxed(0xdeadbeef, base + offset);
-
-       while (1)
-               cpu_do_idle();
-}
-
 static const char *hi3xxx_compat[] __initconst = {
        "hisilicon,hi3620-hi4511",
        NULL,
@@ -85,6 +53,13 @@ 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),
-       .restart        = hi3xxx_restart,
+MACHINE_END
+
+static const char *hix5hd2_compat[] __initconst = {
+       "hisilicon,hix5hd2",
+       NULL,
+};
+
+DT_MACHINE_START(HIX5HD2_DT, "Hisilicon HIX5HD2 (Flattened Device Tree)")
+       .dt_compat      = hix5hd2_compat,
 MACHINE_END