From b437c52c296715eaad77c949fcfc074911a72427 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Fri, 17 Oct 2014 16:18:59 +0200 Subject: ARM: integrator: move restart to the device tree Using the augmented reset driver for the Versatile family, we can move the reset handling for the Integrator out of the machine. We add a "syscon" attribute to the core module, and access the syscon registers using this handle. We need to select SYSCON, POWER, POWER_RESET and POWER_RESET_VERSATILE in order for the restart functionality to always be available on all systems (it should not be optional). Signed-off-by: Linus Walleij --- arch/arm/mach-integrator/cm.h | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/mach-integrator/cm.h') diff --git a/arch/arm/mach-integrator/cm.h b/arch/arm/mach-integrator/cm.h index 4ecff7bff482..5b8ba8247f45 100644 --- a/arch/arm/mach-integrator/cm.h +++ b/arch/arm/mach-integrator/cm.h @@ -11,7 +11,6 @@ void cm_clear_irqs(void); #define CM_CTRL_LED (1 << 0) #define CM_CTRL_nMBDET (1 << 1) #define CM_CTRL_REMAP (1 << 2) -#define CM_CTRL_RESET (1 << 3) /* * Integrator/AP,PP2 specific -- cgit v1.2.3