From 36e2bcf4d70f17257c9a75af70b11c01a96a00bb Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 3 Nov 2011 09:14:07 +0000 Subject: [PATCH] --- yaml --- r: 279945 b: refs/heads/master c: 8390918874324360335370fbcc2c3c9884476884 h: refs/heads/master i: 279943: 739bedb48daaf303f1cfd175437adb12d8c33a8a v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-s3c24xx/cpu.c | 23 ----------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/[refs] b/[refs] index 8c769bfb3b2c..6744df166b75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4045407fd7740642b18bc802e8bab064e79a61e5 +refs/heads/master: 8390918874324360335370fbcc2c3c9884476884 diff --git a/trunk/arch/arm/plat-s3c24xx/cpu.c b/trunk/arch/arm/plat-s3c24xx/cpu.c index 3c6335307fb1..1121df13e15f 100644 --- a/trunk/arch/arm/plat-s3c24xx/cpu.c +++ b/trunk/arch/arm/plat-s3c24xx/cpu.c @@ -192,27 +192,6 @@ static unsigned long s3c24xx_read_idcode_v4(void) return __raw_readl(S3C2410_GSTATUS1); } -/* Hook for arm_pm_restart to ensure we execute the reset code - * with the caches enabled. It seems at least the S3C2440 has a problem - * resetting if there is bus activity interrupted by the reset. - */ -static void s3c24xx_pm_restart(char mode, const char *cmd) -{ - if (mode != 's') { - unsigned long flags; - - local_irq_save(flags); - __cpuc_flush_kern_all(); - __cpuc_flush_user_all(); - - arch_reset(mode, cmd); - local_irq_restore(flags); - } - - /* fallback, or unhandled */ - arm_machine_restart(mode, cmd); -} - void __init s3c24xx_init_io(struct map_desc *mach_desc, int size) { /* initialise the io descriptors we need for initialisation */ @@ -226,7 +205,5 @@ void __init s3c24xx_init_io(struct map_desc *mach_desc, int size) } s3c24xx_init_cpu(); - arm_pm_restart = s3c24xx_pm_restart; - s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids)); }