summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c24xx/mach-jive.c
diff options
context:
space:
mode:
authorSylwester Nawrocki <sylvester.nawrocki@gmail.com>2012-08-28 18:06:49 +0200
committerKukjin Kim <kgene.kim@samsung.com>2012-08-28 18:06:49 +0200
commit42aa322c37b404907a3e2f96e2db4d615a69d604 (patch)
tree9acaa23515ea70ddb9bac1815f905b1303452fb7 /arch/arm/mach-s3c24xx/mach-jive.c
parentARM: EXYNOS: cleanup unused code related to GPS (diff)
downloadlinux-42aa322c37b404907a3e2f96e2db4d615a69d604.tar.xz
linux-42aa322c37b404907a3e2f96e2db4d615a69d604.zip
ARM: S3C24XX: Convert users of s3c2410_gpio_setpin to gpiolib API
This is a prerequisite for removal of deprecated s3c2410_gpio* API from the Samsung gpiolib driver. Cc: Ben Dooks <ben-linux@fluff.org> Cc: Guillaume Gourat <guillaume.gourat@nexvision.tv> Cc: Michel Pollet <buserror@gmail.com> Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-jive.c')
-rw-r--r--arch/arm/mach-s3c24xx/mach-jive.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-jive.c b/arch/arm/mach-s3c24xx/mach-jive.c
index ae73ba34ecc6..471334715c37 100644
--- a/arch/arm/mach-s3c24xx/mach-jive.c
+++ b/arch/arm/mach-s3c24xx/mach-jive.c
@@ -512,8 +512,8 @@ static void jive_power_off(void)
{
printk(KERN_INFO "powering system down...\n");
- s3c2410_gpio_setpin(S3C2410_GPC(5), 1);
- s3c_gpio_cfgpin(S3C2410_GPC(5), S3C2410_GPIO_OUTPUT);
+ gpio_request_one(S3C2410_GPC(5), GPIOF_OUT_INIT_HIGH, NULL);
+ gpio_free(S3C2410_GPC(5));
}
static void __init jive_machine_init(void)
@@ -623,11 +623,11 @@ static void __init jive_machine_init(void)
gpio_request(S3C2410_GPB(7), "jive spi");
gpio_direction_output(S3C2410_GPB(7), 1);
- s3c2410_gpio_setpin(S3C2410_GPB(6), 0);
- s3c_gpio_cfgpin(S3C2410_GPB(6), S3C2410_GPIO_OUTPUT);
+ gpio_request_one(S3C2410_GPB(6), GPIOF_OUT_INIT_LOW, NULL);
+ gpio_free(S3C2410_GPB(6));
- s3c2410_gpio_setpin(S3C2410_GPG(8), 1);
- s3c_gpio_cfgpin(S3C2410_GPG(8), S3C2410_GPIO_OUTPUT);
+ gpio_request_one(S3C2410_GPG(8), GPIOF_OUT_INIT_HIGH, NULL);
+ gpio_free(S3C2410_GPG(8));
/* initialise the WM8750 spi */