aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2443
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-s3c2443')
-rw-r--r--arch/arm/mach-s3c2443/mach-smdk2443.c1
-rw-r--r--arch/arm/mach-s3c2443/s3c2443.c8
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2443/mach-smdk2443.c b/arch/arm/mach-s3c2443/mach-smdk2443.c
index bec107e00441..209236956222 100644
--- a/arch/arm/mach-s3c2443/mach-smdk2443.c
+++ b/arch/arm/mach-s3c2443/mach-smdk2443.c
@@ -145,4 +145,5 @@ MACHINE_START(SMDK2443, "SMDK2443")
145 .map_io = smdk2443_map_io, 145 .map_io = smdk2443_map_io,
146 .init_machine = smdk2443_machine_init, 146 .init_machine = smdk2443_machine_init,
147 .timer = &s3c24xx_timer, 147 .timer = &s3c24xx_timer,
148 .restart = s3c2443_restart,
148MACHINE_END 149MACHINE_END
diff --git a/arch/arm/mach-s3c2443/s3c2443.c b/arch/arm/mach-s3c2443/s3c2443.c
index aa90ae4fc980..b9deaeb0dfff 100644
--- a/arch/arm/mach-s3c2443/s3c2443.c
+++ b/arch/arm/mach-s3c2443/s3c2443.c
@@ -31,7 +31,6 @@
31#include <asm/irq.h> 31#include <asm/irq.h>
32 32
33#include <mach/regs-s3c2443-clock.h> 33#include <mach/regs-s3c2443-clock.h>
34#include <mach/reset.h>
35 34
36#include <plat/gpio-core.h> 35#include <plat/gpio-core.h>
37#include <plat/gpio-cfg.h> 36#include <plat/gpio-cfg.h>
@@ -58,8 +57,11 @@ static struct device s3c2443_dev = {
58 .bus = &s3c2443_subsys, 57 .bus = &s3c2443_subsys,
59}; 58};
60 59
61static void s3c2443_hard_reset(void) 60void s3c2443_restart(char mode, const char *cmd)
62{ 61{
62 if (mode == 's')
63 soft_restart(0);
64
63 __raw_writel(S3C2443_SWRST_RESET, S3C2443_SWRST); 65 __raw_writel(S3C2443_SWRST_RESET, S3C2443_SWRST);
64} 66}
65 67
@@ -67,8 +69,6 @@ int __init s3c2443_init(void)
67{ 69{
68 printk("S3C2443: Initialising architecture\n"); 70 printk("S3C2443: Initialising architecture\n");
69 71
70 s3c24xx_reset_hook = s3c2443_hard_reset;
71
72 s3c_nand_setname("s3c2412-nand"); 72 s3c_nand_setname("s3c2412-nand");
73 s3c_fb_setname("s3c2443-fb"); 73 s3c_fb_setname("s3c2443-fb");
74 74