diff options
| author | Paul Cercueil <paul@crapouillou.net> | 2018-05-10 20:47:51 +0200 |
|---|---|---|
| committer | James Hogan <jhogan@kernel.org> | 2018-05-15 00:58:23 +0200 |
| commit | 1761ad8c9e7985817b037c9a534fbbca452a7fda (patch) | |
| tree | 52c42ac0db2da29c8d66cd6c8c5ed77c588e6a7c /arch/mips/jz4740 | |
| parent | MIPS: qi_lb60: Enable the jz4740-wdt driver (diff) | |
| download | linux-1761ad8c9e7985817b037c9a534fbbca452a7fda.tar.xz linux-1761ad8c9e7985817b037c9a534fbbca452a7fda.zip | |
MIPS: JZ4740: Drop old platform reset code
This work is now performed by the watchdog driver directly.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Acked-by: James Hogan <jhogan@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Wim Van Sebroeck <wim@linux-watchdog.org>
Cc: Mathieu Malaterre <malat@debian.org>
Cc: linux-mips@linux-mips.org
Cc: linux-watchdog@vger.kernel.org
Signed-off-by: James Hogan <jhogan@kernel.org>
Diffstat (limited to 'arch/mips/jz4740')
| -rw-r--r-- | arch/mips/jz4740/reset.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/arch/mips/jz4740/reset.c b/arch/mips/jz4740/reset.c index 67780c4b6573..5bf0cf44b55f 100644 --- a/arch/mips/jz4740/reset.c +++ b/arch/mips/jz4740/reset.c @@ -12,18 +12,9 @@ * */ -#include <linux/clk.h> -#include <linux/io.h> -#include <linux/kernel.h> -#include <linux/pm.h> - #include <asm/reboot.h> -#include <asm/mach-jz4740/base.h> -#include <asm/mach-jz4740/timer.h> - #include "reset.h" -#include "clock.h" static void jz4740_halt(void) { @@ -36,29 +27,7 @@ static void jz4740_halt(void) } } -#define JZ_REG_WDT_DATA 0x00 -#define JZ_REG_WDT_COUNTER_ENABLE 0x04 -#define JZ_REG_WDT_COUNTER 0x08 -#define JZ_REG_WDT_CTRL 0x0c - -static void jz4740_restart(char *command) -{ - void __iomem *wdt_base = ioremap(JZ4740_WDT_BASE_ADDR, 0x0f); - - jz4740_timer_enable_watchdog(); - - writeb(0, wdt_base + JZ_REG_WDT_COUNTER_ENABLE); - - writew(0, wdt_base + JZ_REG_WDT_COUNTER); - writew(0, wdt_base + JZ_REG_WDT_DATA); - writew(BIT(2), wdt_base + JZ_REG_WDT_CTRL); - - writeb(1, wdt_base + JZ_REG_WDT_COUNTER_ENABLE); - jz4740_halt(); -} - void jz4740_reset_init(void) { - _machine_restart = jz4740_restart; _machine_halt = jz4740_halt; } |