diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-11 15:30:47 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 12:57:15 +0000 |
| commit | 114c19b7b53523a6304c4b4fc51a22d006da3726 (patch) | |
| tree | 7a6f792cbee663fc1f8fabf8bcf8b902e489848f /arch/arm/mach-ks8695/include | |
| parent | cb15dff4795932b98459da13dd3dd3693c6dd104 (diff) | |
| download | blackbird-op-linux-114c19b7b53523a6304c4b4fc51a22d006da3726.tar.gz blackbird-op-linux-114c19b7b53523a6304c4b4fc51a22d006da3726.zip | |
ARM: restart: ks8695: use new restart hook
Hook these platforms restart code into the new restart hook rather
than using arch_reset().
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ks8695/include')
| -rw-r--r-- | arch/arm/mach-ks8695/include/mach/system.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/arm/mach-ks8695/include/mach/system.h b/arch/arm/mach-ks8695/include/mach/system.h index ceb19c90aa52..d6de241860bb 100644 --- a/arch/arm/mach-ks8695/include/mach/system.h +++ b/arch/arm/mach-ks8695/include/mach/system.h @@ -14,9 +14,6 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H -#include <linux/io.h> -#include <mach/regs-timer.h> - static void arch_idle(void) { /* @@ -29,20 +26,6 @@ static void arch_idle(void) static void arch_reset(char mode, const char *cmd) { - unsigned int reg; - - if (mode == 's') - soft_restart(0); - - /* disable timer0 */ - reg = __raw_readl(KS8695_TMR_VA + KS8695_TMCON); - __raw_writel(reg & ~TMCON_T0EN, KS8695_TMR_VA + KS8695_TMCON); - - /* enable watchdog mode */ - __raw_writel((10 << 8) | T0TC_WATCHDOG, KS8695_TMR_VA + KS8695_T0TC); - - /* re-enable timer0 */ - __raw_writel(reg | TMCON_T0EN, KS8695_TMR_VA + KS8695_TMCON); } #endif |
