diff options
Diffstat (limited to 'arch/arm/mach-samsung/generic.c')
-rw-r--r-- | arch/arm/mach-samsung/generic.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/arch/arm/mach-samsung/generic.c b/arch/arm/mach-samsung/generic.c index 75965d7826..4f13fce13b 100644 --- a/arch/arm/mach-samsung/generic.c +++ b/arch/arm/mach-samsung/generic.c @@ -21,6 +21,7 @@ #include <config.h> #include <common.h> #include <init.h> +#include <restart.h> #include <io.h> #include <mach/s3c-iomap.h> #include <mach/s3c-generic.h> @@ -29,7 +30,7 @@ #define S3C_WTDAT (S3C_WATCHDOG_BASE + 0x04) #define S3C_WTCNT (S3C_WATCHDOG_BASE + 0x08) -void __noreturn reset_cpu(unsigned long addr) +static void __noreturn samsung_restart_soc(struct restart_handler *rst) { /* Disable watchdog */ writew(0x0000, S3C_WTCON); @@ -41,7 +42,13 @@ void __noreturn reset_cpu(unsigned long addr) writew(0x0021, S3C_WTCON); /* loop forever and wait for reset to happen */ - while(1) - ; + hang(); } -EXPORT_SYMBOL(reset_cpu); + +static int restart_register_feature(void) +{ + restart_handler_register_fn(samsung_restart_soc); + + return 0; +} +coredevice_initcall(restart_register_feature); |