diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-04 12:49:04 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-06 09:32:25 +0900 |
| commit | 408c8b8ca46c16fa09a6795613db74a8d2de7980 (patch) | |
| tree | 4638098a0b956d9a42158d9537deb065d525a021 | |
| parent | 96efa8dac85372fdddb1682949b468226126e333 (diff) | |
| download | op-kernel-dev-408c8b8ca46c16fa09a6795613db74a8d2de7980.zip op-kernel-dev-408c8b8ca46c16fa09a6795613db74a8d2de7980.tar.gz | |
ARM: BAST: Update mach-bast to use gpiolib API
Change mach-bast .c to use gpiolib for the GPIO lines that are directly
manipulated by it.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-bast.c | 6 |
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 02b1b622..d03cbe2 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 = { 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); } |
