aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-03 22:30:42 -0400
committerBen Dooks <ben-linux@fluff.org>2010-05-05 20:32:21 -0400
commitafc84ad11b5c1247c2d0df06f10df69ea7206f6a (patch)
treec6adf4343bec5ee516216083f7113b62aaca3922 /arch
parentf4146a65fbdc5274a437f77ff2f3b4889c0edd0e (diff)
ARM: JIVE: Update mach-jive to use gpiolib API
Change mach-jive to use gpiolib for the GPIO lines that are directly manipulated by it. Note, we ignore any errors from gpio_request(), unlikely to see any. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c2412/mach-jive.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c
index 14f4798291aa..d2bb7d2510fa 100644
--- a/arch/arm/mach-s3c2412/mach-jive.c
+++ b/arch/arm/mach-s3c2412/mach-jive.c
@@ -357,8 +357,7 @@ static void jive_lcm_reset(unsigned int set)
357{ 357{
358 printk(KERN_DEBUG "%s(%d)\n", __func__, set); 358 printk(KERN_DEBUG "%s(%d)\n", __func__, set);
359 359
360 s3c2410_gpio_setpin(S3C2410_GPG(13), set); 360 gpio_set_value(S3C2410_GPG(13), set);
361 s3c2410_gpio_cfgpin(S3C2410_GPG(13), S3C2410_GPIO_OUTPUT);
362} 361}
363 362
364#undef LCD_UPPER_MARGIN 363#undef LCD_UPPER_MARGIN
@@ -391,7 +390,7 @@ static struct ili9320_platdata jive_lcm_config = {
391 390
392static void jive_lcd_spi_chipselect(struct s3c2410_spigpio_info *spi, int cs) 391static void jive_lcd_spi_chipselect(struct s3c2410_spigpio_info *spi, int cs)
393{ 392{
394 s3c2410_gpio_setpin(S3C2410_GPB(7), cs ? 0 : 1); 393 gpio_set_value(S3C2410_GPB(7), cs ? 0 : 1);
395} 394}
396 395
397static struct s3c2410_spigpio_info jive_lcd_spi = { 396static struct s3c2410_spigpio_info jive_lcd_spi = {
@@ -413,7 +412,7 @@ static struct platform_device jive_device_lcdspi = {
413 412
414static void jive_wm8750_chipselect(struct s3c2410_spigpio_info *spi, int cs) 413static void jive_wm8750_chipselect(struct s3c2410_spigpio_info *spi, int cs)
415{ 414{
416 s3c2410_gpio_setpin(S3C2410_GPH(10), cs ? 0 : 1); 415 gpio_set_value(S3C2410_GPH(10), cs ? 0 : 1);
417} 416}
418 417
419static struct s3c2410_spigpio_info jive_wm8750_spi = { 418static struct s3c2410_spigpio_info jive_wm8750_spi = {
@@ -636,11 +635,11 @@ static void __init jive_machine_init(void)
636 635
637 /* initialise the spi */ 636 /* initialise the spi */
638 637
639 s3c2410_gpio_setpin(S3C2410_GPG(13), 0); 638 gpio_request(S3C2410_GPG(13), "lcm reset");
640 s3c2410_gpio_cfgpin(S3C2410_GPG(13), S3C2410_GPIO_OUTPUT); 639 gpio_direction_output(S3C2410_GPG(13), 0);
641 640
642 s3c2410_gpio_setpin(S3C2410_GPB(7), 1); 641 gpio_request(S3C2410_GPB(7), "jive spi");
643 s3c2410_gpio_cfgpin(S3C2410_GPB(7), S3C2410_GPIO_OUTPUT); 642 gpio_direction_output(S3C2410_GPB(7), 1);
644 643
645 s3c2410_gpio_setpin(S3C2410_GPB(6), 0); 644 s3c2410_gpio_setpin(S3C2410_GPB(6), 0);
646 s3c2410_gpio_cfgpin(S3C2410_GPB(6), S3C2410_GPIO_OUTPUT); 645 s3c2410_gpio_cfgpin(S3C2410_GPB(6), S3C2410_GPIO_OUTPUT);
@@ -650,8 +649,8 @@ static void __init jive_machine_init(void)
650 649
651 /* initialise the WM8750 spi */ 650 /* initialise the WM8750 spi */
652 651
653 s3c2410_gpio_setpin(S3C2410_GPH(10), 1); 652 gpio_request(S3C2410_GPH(10), "jive wm8750 spi");
654 s3c2410_gpio_cfgpin(S3C2410_GPH(10), S3C2410_GPIO_OUTPUT); 653 gpio_direction_output(S3C2410_GPH(10), 1);
655 654
656 /* Turn off suspend on both USB ports, and switch the 655 /* Turn off suspend on both USB ports, and switch the
657 * selectable USB port to USB device mode. */ 656 * selectable USB port to USB device mode. */