diff options
| author |   Heiko Stuebner <heiko@sntech.de> | 2011-12-22 23:37:44 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 12:57:18 +0000 |
| commit | 57538975917d4b0c467dbdd21328337f059bc027 (patch) | |
| tree | e7fbdeacc9d55950f8092edf53603ec557edd667 /arch/arm/mach-s3c2410 | |
| parent | ARM: restart: riscpc: use new restart hook (diff) | |
| download | linux-dev-57538975917d4b0c467dbdd21328337f059bc027.tar.xz linux-dev-57538975917d4b0c467dbdd21328337f059bc027.zip | |
ARM: 7254/1: restart: S3C24XX: move SWRST based S3C platforms to
S3C2412/S3C2416/S3C2443 use a special register to signal the reset to
the processor and used therefore the s3c24xx_reset_hook mechanism in the
s3c24xx-specific arch reset.
This patch introduces restart functions for these architectures,
moves the board files to them and removes the s3c24xx_reset_hook
infrastructure, as all users are gone.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s3c2410')
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/reset.h | 22 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/system-reset.h | 5 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/system.h | 2 |
3 files changed, 0 insertions, 29 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/reset.h b/arch/arm/mach-s3c2410/include/mach/reset.h deleted file mode 100644 index f8c9387b049d..000000000000 --- a/arch/arm/mach-s3c2410/include/mach/reset.h +++ /dev/null @@ -1,22 +0,0 @@ -/* arch/arm/mach-s3c2410/include/mach/reset.h - * - * Copyright (c) 2007 Simtec Electronics - * Ben Dooks <ben@simtec.co.uk> - * http://armlinux.simtec.co.uk/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * S3C2410 CPU reset controls -*/ - -#ifndef __ASM_ARCH_RESET_H -#define __ASM_ARCH_RESET_H __FILE__ - -/* This allows the over-ride of the default reset code -*/ - -extern void (*s3c24xx_reset_hook)(void); - -#endif /* __ASM_ARCH_RESET_H */ diff --git a/arch/arm/mach-s3c2410/include/mach/system-reset.h b/arch/arm/mach-s3c2410/include/mach/system-reset.h index 913893d44650..1e495f35ddd2 100644 --- a/arch/arm/mach-s3c2410/include/mach/system-reset.h +++ b/arch/arm/mach-s3c2410/include/mach/system-reset.h @@ -13,8 +13,6 @@ #include <mach/hardware.h> #include <plat/watchdog-reset.h> -extern void (*s3c24xx_reset_hook)(void); - static void arch_reset(char mode, const char *cmd) { @@ -22,9 +20,6 @@ arch_reset(char mode, const char *cmd) soft_restart(0); } - if (s3c24xx_reset_hook) - s3c24xx_reset_hook(); - arch_wdt_reset(); /* we'll take a jump through zero as a poor second */ diff --git a/arch/arm/mach-s3c2410/include/mach/system.h b/arch/arm/mach-s3c2410/include/mach/system.h index a8cbca6701e5..eef8f24628e3 100644 --- a/arch/arm/mach-s3c2410/include/mach/system.h +++ b/arch/arm/mach-s3c2410/include/mach/system.h @@ -15,12 +15,10 @@ #include <mach/map.h> #include <mach/idle.h> -#include <mach/reset.h> #include <mach/regs-clock.h> void (*s3c24xx_idle)(void); -void (*s3c24xx_reset_hook)(void); void s3c24xx_default_idle(void) { |