diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 08:49:25 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 08:49:25 +0100 |
| commit | a3685f00652af83f12b63e3b4ef48f29581ba48b (patch) | |
| tree | 18ec9eed3deabf3c6b9bec206765a4dd0d8cf9ec /arch/arm/mach-s3c2410/mach-bast.c | |
| parent | b12f3cbd7a9a869eae1eb108da02526b132ba80b (diff) | |
| parent | 63b1f51b2405573d47bf5b9ab6e7cd5c697d3dcc (diff) | |
Merge branch 'for-rmk/2635' of git://git.fluff.org/bjdooks/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-bast.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-bast.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index 02b1b6220cb..b061ddcf306 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c @@ -61,6 +61,7 @@ #include <plat/devs.h> #include <plat/cpu.h> #include <plat/cpu-freq.h> +#include <plat/gpio-cfg.h> #include <plat/audio-simtec.h> #include "usb-simtec.h" @@ -216,15 +217,13 @@ 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; } static int bast_pm_resume(struct sys_device *sd) { - s3c2410_gpio_cfgpin(S3C2410_GPA(21), S3C2410_GPA21_nRSTOUT); + s3c_gpio_cfgpin(S3C2410_GPA(21), S3C2410_GPA21_nRSTOUT); return 0; } @@ -658,6 +657,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); } |