aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410/mach-bast.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-bast.c')
-rw-r--r--arch/arm/mach-s3c2410/mach-bast.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index 02b1b6220cba..d03cbe2acde6 100644
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -216,9 +216,7 @@ static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = {
216static int bast_pm_suspend(struct sys_device *sd, pm_message_t state) 216static int bast_pm_suspend(struct sys_device *sd, pm_message_t state)
217{ 217{
218 /* ensure that an nRESET is not generated on resume. */ 218 /* ensure that an nRESET is not generated on resume. */
219 s3c2410_gpio_setpin(S3C2410_GPA(21), 1); 219 gpio_direction_output(S3C2410_GPA(21), 1);
220 s3c2410_gpio_cfgpin(S3C2410_GPA(21), S3C2410_GPIO_OUTPUT);
221
222 return 0; 220 return 0;
223} 221}
224 222
@@ -658,6 +656,8 @@ static void __init bast_init(void)
658 nor_simtec_init(); 656 nor_simtec_init();
659 simtec_audio_add(NULL, true, &bast_audio); 657 simtec_audio_add(NULL, true, &bast_audio);
660 658
659 WARN_ON(gpio_request(S3C2410_GPA(21), "bast nreset"));
660
661 s3c_cpufreq_setboard(&bast_cpufreq); 661 s3c_cpufreq_setboard(&bast_cpufreq);
662} 662}
663 663