summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator/cm.h
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-10-17 16:18:59 +0200
committerLinus Walleij <linus.walleij@linaro.org>2014-11-13 10:32:02 +0100
commitb437c52c296715eaad77c949fcfc074911a72427 (patch)
treef35a8df68af11df0ea1b58cc26b796b63bdde482 /arch/arm/mach-integrator/cm.h
parentARM: integrator: move AP timer to clocksource (diff)
downloadlinux-b437c52c296715eaad77c949fcfc074911a72427.tar.xz
linux-b437c52c296715eaad77c949fcfc074911a72427.zip
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 <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-integrator/cm.h')
-rw-r--r--arch/arm/mach-integrator/cm.h1
1 files changed, 0 insertions, 1 deletions
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