diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-05-03 23:32:16 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-05 20:32:23 -0400 |
commit | 2d2e0c89982c532f9da6891a733b7be43c7048ce (patch) | |
tree | 3bd0512a08e94d4e51b5c1daaa859f5af94ada48 /arch/arm/mach-s3c2410/mach-qt2410.c | |
parent | db61ac54c9bea389b98f88cb4a23f8dd1edde07f (diff) |
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>
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-qt2410.c')
-rw-r--r-- | arch/arm/mach-s3c2410/mach-qt2410.c | 7 |
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 92a4ec375d82..e9762fb30d38 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) | |||
219 | { | 219 | { |
220 | switch (cs) { | 220 | switch (cs) { |
221 | case BITBANG_CS_ACTIVE: | 221 | case BITBANG_CS_ACTIVE: |
222 | s3c2410_gpio_setpin(S3C2410_GPB(5), 0); | 222 | gpio_set_value(S3C2410_GPB(5), 0); |
223 | break; | 223 | break; |
224 | case BITBANG_CS_INACTIVE: | 224 | case BITBANG_CS_INACTIVE: |
225 | s3c2410_gpio_setpin(S3C2410_GPB(5), 1); | 225 | gpio_set_value(S3C2410_GPB(5), 1); |
226 | break; | 226 | break; |
227 | } | 227 | } |
228 | } | 228 | } |
@@ -353,7 +353,8 @@ static void __init qt2410_machine_init(void) | |||
353 | s3c24xx_udc_set_platdata(&qt2410_udc_cfg); | 353 | s3c24xx_udc_set_platdata(&qt2410_udc_cfg); |
354 | s3c_i2c0_set_platdata(NULL); | 354 | s3c_i2c0_set_platdata(NULL); |
355 | 355 | ||
356 | s3c2410_gpio_cfgpin(S3C2410_GPB(5), S3C2410_GPIO_OUTPUT); | 356 | WARN_ON(gpio_request(S3C2410_GPB(5), "spi cs")); |
357 | gpio_direction_output(S3C2410_GPB(5), 1); | ||
357 | 358 | ||
358 | platform_add_devices(qt2410_devices, ARRAY_SIZE(qt2410_devices)); | 359 | platform_add_devices(qt2410_devices, ARRAY_SIZE(qt2410_devices)); |
359 | s3c_pm_init(); | 360 | s3c_pm_init(); |