diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-05 12:10:55 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 12:57:14 +0000 |
| commit | d1b860fbb2b0d25a5ccd8165ea4db2914b0820f5 (patch) | |
| tree | b65b0c6ea80f9a9d0146fbaab6306a3be53ca449 /arch/arm/mach-ixp4xx/include | |
| parent | b219415c39053dbe70e88c361b5e943acd74546c (diff) | |
| download | linux-stable-d1b860fbb2b0d25a5ccd8165ea4db2914b0820f5.tar.gz linux-stable-d1b860fbb2b0d25a5ccd8165ea4db2914b0820f5.tar.bz2 linux-stable-d1b860fbb2b0d25a5ccd8165ea4db2914b0820f5.zip | |
ARM: restart: ixp4xx: use new restart hook
Hook these platforms restart code into the new restart hook rather
than using arch_reset().
Acked-by: Krzysztof Hałasa <khc@pm.waw.pl>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ixp4xx/include')
| -rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/platform.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/system.h | 21 |
2 files changed, 1 insertions, 21 deletions
diff --git a/arch/arm/mach-ixp4xx/include/mach/platform.h b/arch/arm/mach-ixp4xx/include/mach/platform.h index e824c02c825a..df9250bbf13d 100644 --- a/arch/arm/mach-ixp4xx/include/mach/platform.h +++ b/arch/arm/mach-ixp4xx/include/mach/platform.h @@ -125,6 +125,7 @@ extern void ixp4xx_init_irq(void); extern void ixp4xx_sys_init(void); extern void ixp4xx_timer_init(void); extern struct sys_timer ixp4xx_timer; +extern void ixp4xx_restart(char, const char *); extern void ixp4xx_pci_preinit(void); struct pci_sys_data; extern int ixp4xx_setup(int nr, struct pci_sys_data *sys); diff --git a/arch/arm/mach-ixp4xx/include/mach/system.h b/arch/arm/mach-ixp4xx/include/mach/system.h index 24337d9d275b..72db2bbb6834 100644 --- a/arch/arm/mach-ixp4xx/include/mach/system.h +++ b/arch/arm/mach-ixp4xx/include/mach/system.h @@ -8,9 +8,6 @@ * published by the Free Software Foundation. * */ - -#include <mach/hardware.h> - static inline void arch_idle(void) { /* ixp4xx does not implement the XScale PWRMODE register, @@ -21,24 +18,6 @@ static inline void arch_idle(void) #endif } - static inline void arch_reset(char mode, const char *cmd) { - if ( 1 && mode == 's') { - /* Jump into ROM at address 0 */ - soft_restart(0); - } else { - /* Use on-chip reset capability */ - - /* set the "key" register to enable access to - * "timer" and "enable" registers - */ - *IXP4XX_OSWK = IXP4XX_WDT_KEY; - - /* write 0 to the timer register for an immediate reset */ - *IXP4XX_OSWT = 0; - - *IXP4XX_OSWE = IXP4XX_WDT_RESET_ENABLE | IXP4XX_WDT_COUNT_ENABLE; - } } - |