aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2440
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-05 21:59:55 -0400
committerBen Dooks <ben-linux@fluff.org>2010-05-05 21:59:55 -0400
commit64f508da584f983642eb8cf808fcca68f9efa44a (patch)
tree9736b229d4a547d0537742295b1d8422832fb49d /arch/arm/mach-s3c2440
parent9933847b29bb3d3447d19236375ccc84bfbcf3df (diff)
ARM: mini2440: Move to using gpiolib API and s3c_gpio functions
Move the mach-mini2440 to using the gpiolib API for GPIOS it directly uses, and s3c_gpio calls for configuration. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c2440')
-rw-r--r--arch/arm/mach-s3c2440/mach-mini2440.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-s3c2440/mach-mini2440.c b/arch/arm/mach-s3c2440/mach-mini2440.c
index 362a2f97f748..a76bcda210ad 100644
--- a/arch/arm/mach-s3c2440/mach-mini2440.c
+++ b/arch/arm/mach-s3c2440/mach-mini2440.c
@@ -103,10 +103,10 @@ static void mini2440_udc_pullup(enum s3c2410_udc_cmd_e cmd)
103 103
104 switch (cmd) { 104 switch (cmd) {
105 case S3C2410_UDC_P_ENABLE : 105 case S3C2410_UDC_P_ENABLE :
106 s3c2410_gpio_setpin(S3C2410_GPC(5), 1); 106 gpio_set_value(S3C2410_GPC(5), 1);
107 break; 107 break;
108 case S3C2410_UDC_P_DISABLE : 108 case S3C2410_UDC_P_DISABLE :
109 s3c2410_gpio_setpin(S3C2410_GPC(5), 0); 109 gpio_set_value(S3C2410_GPC(5), 0);
110 break; 110 break;
111 case S3C2410_UDC_P_RESET : 111 case S3C2410_UDC_P_RESET :
112 break; 112 break;
@@ -636,22 +636,22 @@ static void __init mini2440_init(void)
636 s3c_gpio_cfgpin(S3C2410_GPC(0), S3C2410_GPC0_LEND); 636 s3c_gpio_cfgpin(S3C2410_GPC(0), S3C2410_GPC0_LEND);
637 637
638 /* Turn the backlight early on */ 638 /* Turn the backlight early on */
639 s3c2410_gpio_setpin(S3C2410_GPG(4), 1); 639 WARN_ON(gpio_request(S3C2410_GPG(4), "backlight"));
640 s3c_gpio_cfgpin(S3C2410_GPG(4), S3C2410_GPIO_OUTPUT); 640 gpio_direction_output(S3C2410_GPG(4), 1);
641 641
642 /* remove pullup on optional PWM backlight -- unused on 3.5 and 7"s */ 642 /* remove pullup on optional PWM backlight -- unused on 3.5 and 7"s */
643 s3c2410_gpio_pullup(S3C2410_GPB(1), 0); 643 s3c_gpio_setpull(S3C2410_GPB(1), S3C_GPIO_PULL_UP);
644 s3c2410_gpio_setpin(S3C2410_GPB(1), 0); 644 s3c2410_gpio_setpin(S3C2410_GPB(1), 0);
645 s3c_gpio_cfgpin(S3C2410_GPB(1), S3C2410_GPIO_INPUT); 645 s3c_gpio_cfgpin(S3C2410_GPB(1), S3C2410_GPIO_INPUT);
646 646
647 /* Make sure the D+ pullup pin is output */ 647 /* Make sure the D+ pullup pin is output */
648 s3c_gpio_cfgpin(S3C2410_GPC(5), S3C2410_GPIO_OUTPUT); 648 WARN_ON(gpio_request(S3C2410_GPC(5), "udc pup"));
649 gpio_direction_output(S3C2410_GPC(5), 0);
649 650
650 /* mark the key as input, without pullups (there is one on the board) */ 651 /* mark the key as input, without pullups (there is one on the board) */
651 for (i = 0; i < ARRAY_SIZE(mini2440_buttons); i++) { 652 for (i = 0; i < ARRAY_SIZE(mini2440_buttons); i++) {
652 s3c2410_gpio_pullup(mini2440_buttons[i].gpio, 0); 653 s3c_gpio_setpull(mini2440_buttons[i].gpio, S3C_GPIO_PULL_UP);
653 s3c_gpio_cfgpin(mini2440_buttons[i].gpio, 654 s3c_gpio_cfgpin(mini2440_buttons[i].gpio, S3C2410_GPIO_INPUT);
654 S3C2410_GPIO_INPUT);
655 } 655 }
656 if (features.lcd_index != -1) { 656 if (features.lcd_index != -1) {
657 int li; 657 int li;