Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-socfpga / socfpga.c

diff --git a/arch/arm/mach-socfpga/socfpga.c b/arch/arm/mach-socfpga/socfpga.c
index 8ea11b472b91a0950826c9f81aabb1404c232130..bfce9641e32f76299aa8555b997fe2e55fb142ad 100644 (file)
--- a/arch/arm/mach-socfpga/socfpga.c
+++ b/arch/arm/mach-socfpga/socfpga.c
@@ -19,6 +19,7 @@
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
+#include <linux/reboot.h>
 
 #include <asm/hardware/cache-l2x0.h>
 #include <asm/mach/arch.h>
@@ -89,13 +90,13 @@ static void __init socfpga_init_irq(void)
        socfpga_sysmgr_init();
 }
 
-static void socfpga_cyclone5_restart(char mode, const char *cmd)
+static void socfpga_cyclone5_restart(enum reboot_mode mode, const char *cmd)
 {
        u32 temp;
 
        temp = readl(rst_manager_base_addr + SOCFPGA_RSTMGR_CTRL);
 
-       if (mode == 'h')
+       if (mode == REBOOT_HARD)
                temp |= RSTMGR_CTRL_SWCOLDRSTREQ;
        else
                temp |= RSTMGR_CTRL_SWWARMRSTREQ;