summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-04 12:32:16 +0900
committerBen Dooks <ben-linux@fluff.org>2010-05-06 09:32:23 +0900
commit2d2e0c89982c532f9da6891a733b7be43c7048ce (patch)
tree3bd0512a08e94d4e51b5c1daaa859f5af94ada48
parentdb61ac54c9bea389b98f88cb4a23f8dd1edde07f (diff)
downloadlinux-3.10-2d2e0c89982c532f9da6891a733b7be43c7048ce.tar.gz
linux-3.10-2d2e0c89982c532f9da6891a733b7be43c7048ce.tar.bz2
linux-3.10-2d2e0c89982c532f9da6891a733b7be43c7048ce.zip
ARM: QT2410: Update mach-qt2410 to use gpiolib API
Change mach-qt2410.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-qt2410.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c
index 92a4ec375d8..e9762fb30d3 100644
--- a/arch/arm/mach-s3c2410/mach-qt2410.c
+++ b/arch/arm/mach-s3c2410/mach-qt2410.c
@@ -219,10 +219,10 @@ static void spi_gpio_cs(struct s3c2410_spigpio_info *spi, int cs)
{
switch (cs) {
case BITBANG_CS_ACTIVE:
- s3c2410_gpio_setpin(S3C2410_GPB(5), 0);
+ gpio_set_value(S3C2410_GPB(5), 0);
break;
case BITBANG_CS_INACTIVE:
- s3c2410_gpio_setpin(S3C2410_GPB(5), 1);
+ gpio_set_value(S3C2410_GPB(5), 1);
break;
}
}
@@ -353,7 +353,8 @@ static void __init qt2410_machine_init(void)
s3c24xx_udc_set_platdata(&qt2410_udc_cfg);
s3c_i2c0_set_platdata(NULL);
- s3c2410_gpio_cfgpin(S3C2410_GPB(5), S3C2410_GPIO_OUTPUT);
+ WARN_ON(gpio_request(S3C2410_GPB(5), "spi cs"));
+ gpio_direction_output(S3C2410_GPB(5), 1);
platform_add_devices(qt2410_devices, ARRAY_SIZE(qt2410_devices));
s3c_pm_init();