diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-10-17 16:18:59 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-11-13 10:32:02 +0100 |
| commit | b437c52c296715eaad77c949fcfc074911a72427 (patch) | |
| tree | f35a8df68af11df0ea1b58cc26b796b63bdde482 /arch/arm/mach-integrator/core.c | |
| parent | beb5818bd012953c79de38f9726f327d8e311569 (diff) | |
| download | op-kernel-dev-b437c52c296715eaad77c949fcfc074911a72427.zip op-kernel-dev-b437c52c296715eaad77c949fcfc074911a72427.tar.gz | |
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/core.c')
| -rw-r--r-- | arch/arm/mach-integrator/core.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c index e3f3aca..b06fd9f 100644 --- a/arch/arm/mach-integrator/core.c +++ b/arch/arm/mach-integrator/core.c @@ -140,14 +140,6 @@ void __init integrator_reserve(void) memblock_reserve(PHYS_OFFSET, __pa(swapper_pg_dir) - PHYS_OFFSET); } -/* - * To reset, we hit the on-board reset register in the system FPGA - */ -void integrator_restart(enum reboot_mode mode, const char *cmd) -{ - cm_control(CM_CTRL_RESET, CM_CTRL_RESET); -} - static u32 integrator_id; static ssize_t intcp_get_manf(struct device *dev, |
