---

yaml --- r: 191921 b: refs/heads/master c: 408c8b8 h: refs/heads/master i: 191919: c8def42 v: v3
git-mirror · May 6, 2010 · 17d7e3d · 17d7e3d
1 parent 7e1d623
commit 17d7e3d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96efa8dac85372fdddb1682949b468226126e333
+refs/heads/master: 408c8b8ca46c16fa09a6795613db74a8d2de7980
diff --git a/trunk/arch/arm/mach-s3c2410/mach-bast.c b/trunk/arch/arm/mach-s3c2410/mach-bast.c
@@ -216,9 +216,7 @@ static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = {
 static int bast_pm_suspend(struct sys_device *sd, pm_message_t state)
 {
 	/* ensure that an nRESET is not generated on resume. */
-	s3c2410_gpio_setpin(S3C2410_GPA(21), 1);
-	s3c2410_gpio_cfgpin(S3C2410_GPA(21), S3C2410_GPIO_OUTPUT);
-
+	gpio_direction_output(S3C2410_GPA(21), 1);
 	return 0;
 }
 
@@ -658,6 +656,8 @@ static void __init bast_init(void)
 	nor_simtec_init();
 	simtec_audio_add(NULL, true, &bast_audio);
 
+	WARN_ON(gpio_request(S3C2410_GPA(21), "bast nreset"));
+
 	s3c_cpufreq_setboard(&bast_cpufreq);
 }