ARM: s3c24xx: Switch to common GPIO controlled UDC pullup implementation

Currently all boards using the s3c2410_udc driver use a GPIO to control the
state of the pullup, as a result the same code is reimplemented in each board
This patch changes these boards to use the common implementation for GPIO
controlled pullup in the UDC driver.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 1 insertions, 20 deletions

diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c
index 271b9aa6d40a..66f44440d5d3 100644
--- a/arch/arm/mach-s3c2410/mach-n30.c
+++ b/arch/arm/mach-s3c2410/mach-n30.c
@@ -84,26 +84,10 @@ static struct s3c2410_uartcfg n30_uartcfgs[] = {
         },
 };
 
-static void n30_udc_pullup(enum s3c2410_udc_cmd_e cmd)
-{
-        switch (cmd) {
-        case S3C2410_UDC_P_ENABLE :
-                gpio_set_value(S3C2410_GPB(3), 1);
-                break;
-        case S3C2410_UDC_P_DISABLE :
-                gpio_set_value(S3C2410_GPB(3), 0);
-                break;
-        case S3C2410_UDC_P_RESET :
-                break;
-        default:
-                break;
-        }
-}
-
 static struct s3c2410_udc_mach_info n30_udc_cfg __initdata = {
-        .udc_command            = n30_udc_pullup,
         .vbus_pin               = S3C2410_GPG(1),
         .vbus_pin_inverted      = 0,
+        .pullup_pin             = S3C2410_GPB(3),
 };
 
 static struct gpio_keys_button n30_buttons[] = {
@@ -596,9 +580,6 @@ static void __init n30_init(void)
 
                 platform_add_devices(n35_devices, ARRAY_SIZE(n35_devices));
         }
-
-        WARN_ON(gpio_request(S3C2410_GPB(3), "udc pup"));
-        gpio_direction_output(S3C2410_GPB(3), 0);
 }
 
 MACHINE_START(N30, "Acer-N30")