diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2014-06-09 11:36:56 +0200 |
|---|---|---|
| committer | Ian Campbell <ijc@hellion.org.uk> | 2014-07-06 20:12:44 +0100 |
| commit | c7e79dec85f324565cee03f5be1d1a7765481573 (patch) | |
| tree | 15381b8ae19d3b4ef99c25d3a9a490e50d317d8d /arch | |
| parent | b6ae6765c5a9e5daa3799e4d65562d3184712506 (diff) | |
| download | talos-obmc-uboot-c7e79dec85f324565cee03f5be1d1a7765481573.tar.gz talos-obmc-uboot-c7e79dec85f324565cee03f5be1d1a7765481573.zip | |
sunxi: Implement reset_cpu
There is no way to reset the cpu, so use the watchdog for this.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv7/sunxi/board.c | 7 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-sunxi/timer.h | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c index 49c94489ee..c80b42121c 100644 --- a/arch/arm/cpu/armv7/sunxi/board.c +++ b/arch/arm/cpu/armv7/sunxi/board.c @@ -56,6 +56,13 @@ int gpio_init(void) void reset_cpu(ulong addr) { + static const struct sunxi_wdog *wdog = + &((struct sunxi_timer_reg *)SUNXI_TIMER_BASE)->wdog; + + /* Set the watchdog for its shortest interval (.5s) and wait */ + writel(WDT_MODE_RESET_EN | WDT_MODE_EN, &wdog->mode); + writel(WDT_CTRL_KEY | WDT_CTRL_RESTART, &wdog->ctl); + while (1); } /* do some early init */ diff --git a/arch/arm/include/asm/arch-sunxi/timer.h b/arch/arm/include/asm/arch-sunxi/timer.h index 6aacfd7b39..58e14fd0f7 100644 --- a/arch/arm/include/asm/arch-sunxi/timer.h +++ b/arch/arm/include/asm/arch-sunxi/timer.h @@ -11,6 +11,11 @@ #ifndef _SUNXI_TIMER_H_ #define _SUNXI_TIMER_H_ +#define WDT_CTRL_RESTART (0x1 << 0) +#define WDT_CTRL_KEY (0x0a57 << 1) +#define WDT_MODE_EN (0x1 << 0) +#define WDT_MODE_RESET_EN (0x1 << 1) + #ifndef __ASSEMBLY__ #include <linux/types.h> |
