aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylwester Nawrocki <sylvester.nawrocki@gmail.com>2012-07-13 18:04:50 +0900
committerKukjin Kim <kgene.kim@samsung.com>2012-07-13 18:04:50 +0900
commit5c9fb56b456eb4ebb82adfcad2edeb3c4821925a (patch)
tree4b3cf50207d5148371584ae13dd14550368551a9
parentARM: S3C24XX: Convert SMDK board file to the gpiolib API (diff)
downloadlinux-dev-5c9fb56b456eb4ebb82adfcad2edeb3c4821925a.tar.xz
linux-dev-5c9fb56b456eb4ebb82adfcad2edeb3c4821925a.zip
ARM: S3C24XX: Convert QT2410 board file to the gpiolib API
Replace SoC specific GPIO functions with the gpiolib API. The LED gpio is freed right after it is configured so it can be acquired in the s3c24xx_led driver. This change is required for converting the s3c24xx_led driver to the gpiolib API. Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com> Acked-by: Harald Welte <laforge@gnumonks.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/mach-s3c24xx/mach-qt2410.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-qt2410.c b/arch/arm/mach-s3c24xx/mach-qt2410.c
index b868dddcb836..678bbca2b5e5 100644
--- a/arch/arm/mach-s3c24xx/mach-qt2410.c
+++ b/arch/arm/mach-s3c24xx/mach-qt2410.c
@@ -47,7 +47,6 @@
#include <asm/irq.h>
#include <asm/mach-types.h>
-#include <mach/regs-gpio.h>
#include <mach/leds-gpio.h>
#include <mach/regs-lcd.h>
#include <plat/regs-serial.h>
@@ -325,8 +324,9 @@ static void __init qt2410_machine_init(void)
}
s3c24xx_fb_set_platdata(&qt2410_fb_info);
- s3c_gpio_cfgpin(S3C2410_GPB(0), S3C2410_GPIO_OUTPUT);
- s3c2410_gpio_setpin(S3C2410_GPB(0), 1);
+ /* set initial state of the LED GPIO */
+ WARN_ON(gpio_request_one(S3C2410_GPB(0), GPIOF_OUT_INIT_HIGH, NULL));
+ gpio_free(S3C2410_GPB(0));
s3c24xx_udc_set_platdata(&qt2410_udc_cfg);
s3c_i2c0_set_platdata(NULL);