diff options
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-n30.c')
-rw-r--r-- | arch/arm/mach-s3c2410/mach-n30.c | 21 |
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[] = { | |||
84 | }, | 84 | }, |
85 | }; | 85 | }; |
86 | 86 | ||
87 | static void n30_udc_pullup(enum s3c2410_udc_cmd_e cmd) | ||
88 | { | ||
89 | switch (cmd) { | ||
90 | case S3C2410_UDC_P_ENABLE : | ||
91 | gpio_set_value(S3C2410_GPB(3), 1); | ||
92 | break; | ||
93 | case S3C2410_UDC_P_DISABLE : | ||
94 | gpio_set_value(S3C2410_GPB(3), 0); | ||
95 | break; | ||
96 | case S3C2410_UDC_P_RESET : | ||
97 | break; | ||
98 | default: | ||
99 | break; | ||
100 | } | ||
101 | } | ||
102 | |||
103 | static struct s3c2410_udc_mach_info n30_udc_cfg __initdata = { | 87 | static struct s3c2410_udc_mach_info n30_udc_cfg __initdata = { |
104 | .udc_command = n30_udc_pullup, | ||
105 | .vbus_pin = S3C2410_GPG(1), | 88 | .vbus_pin = S3C2410_GPG(1), |
106 | .vbus_pin_inverted = 0, | 89 | .vbus_pin_inverted = 0, |
90 | .pullup_pin = S3C2410_GPB(3), | ||
107 | }; | 91 | }; |
108 | 92 | ||
109 | static struct gpio_keys_button n30_buttons[] = { | 93 | static struct gpio_keys_button n30_buttons[] = { |
@@ -596,9 +580,6 @@ static void __init n30_init(void) | |||
596 | 580 | ||
597 | platform_add_devices(n35_devices, ARRAY_SIZE(n35_devices)); | 581 | platform_add_devices(n35_devices, ARRAY_SIZE(n35_devices)); |
598 | } | 582 | } |
599 | |||
600 | WARN_ON(gpio_request(S3C2410_GPB(3), "udc pup")); | ||
601 | gpio_direction_output(S3C2410_GPB(3), 0); | ||
602 | } | 583 | } |
603 | 584 | ||
604 | MACHINE_START(N30, "Acer-N30") | 585 | MACHINE_START(N30, "Acer-N30") |