summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator/integrator_cp.c
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/integrator_cp.c
parentbeb5818bd012953c79de38f9726f327d8e311569 (diff)
downloadlinux-b437c52c296715eaad77c949fcfc074911a72427.tar.gz
linux-b437c52c296715eaad77c949fcfc074911a72427.tar.bz2
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/integrator_cp.c')
-rw-r--r--arch/arm/mach-integrator/integrator_cp.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index cca02eb75eb5..fa8475b4872d 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -324,6 +324,5 @@ DT_MACHINE_START(INTEGRATOR_CP_DT, "ARM Integrator/CP (Device Tree)")
.init_early = intcp_init_early,
.init_irq = intcp_init_irq_of,
.init_machine = intcp_init_of,
- .restart = integrator_restart,
.dt_compat = intcp_dt_board_compat,
MACHINE_END