diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2011-03-07 02:42:00 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-07 15:23:22 -0500 |
commit | e27c3c5c7e0fb107990c7f465a3525312f6d45aa (patch) | |
tree | 697835d843f1310cc670511ad078e1ddd305f0ec /arch/arm/mach-s3c2412 | |
parent | a74022a55e44fe2044ac3660452cafecb300aece (diff) |
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>
Diffstat (limited to 'arch/arm/mach-s3c2412')
-rw-r--r-- | arch/arm/mach-s3c2412/mach-smdk2413.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/arch/arm/mach-s3c2412/mach-smdk2413.c b/arch/arm/mach-s3c2412/mach-smdk2413.c index 8e5758bdd666..834cfb61bcfe 100644 --- a/arch/arm/mach-s3c2412/mach-smdk2413.c +++ b/arch/arm/mach-s3c2412/mach-smdk2413.c | |||
@@ -78,28 +78,9 @@ static struct s3c2410_uartcfg smdk2413_uartcfgs[] __initdata = { | |||
78 | } | 78 | } |
79 | }; | 79 | }; |
80 | 80 | ||
81 | static void smdk2413_udc_pullup(enum s3c2410_udc_cmd_e cmd) | ||
82 | { | ||
83 | printk(KERN_DEBUG "udc: pullup(%d)\n",cmd); | ||
84 | |||
85 | switch (cmd) | ||
86 | { | ||
87 | case S3C2410_UDC_P_ENABLE : | ||
88 | gpio_set_value(S3C2410_GPF(2), 1); | ||
89 | break; | ||
90 | case S3C2410_UDC_P_DISABLE : | ||
91 | gpio_set_value(S3C2410_GPF(2), 0); | ||
92 | break; | ||
93 | case S3C2410_UDC_P_RESET : | ||
94 | break; | ||
95 | default: | ||
96 | break; | ||
97 | } | ||
98 | } | ||
99 | |||
100 | 81 | ||
101 | static struct s3c2410_udc_mach_info smdk2413_udc_cfg __initdata = { | 82 | static struct s3c2410_udc_mach_info smdk2413_udc_cfg __initdata = { |
102 | .udc_command = smdk2413_udc_pullup, | 83 | .pullup_pin = S3C2410_GPF(2), |
103 | }; | 84 | }; |
104 | 85 | ||
105 | 86 | ||
@@ -133,9 +114,6 @@ static void __init smdk2413_machine_init(void) | |||
133 | { /* Turn off suspend on both USB ports, and switch the | 114 | { /* Turn off suspend on both USB ports, and switch the |
134 | * selectable USB port to USB device mode. */ | 115 | * selectable USB port to USB device mode. */ |
135 | 116 | ||
136 | WARN_ON(gpio_request(S3C2410_GPF(2), "udc pull")); | ||
137 | gpio_direction_output(S3C2410_GPF(2), 0); | ||
138 | |||
139 | s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST | | 117 | s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST | |
140 | S3C2410_MISCCR_USBSUSPND0 | | 118 | S3C2410_MISCCR_USBSUSPND0 | |
141 | S3C2410_MISCCR_USBSUSPND1, 0x0); | 119 | S3C2410_MISCCR_USBSUSPND1, 0x0); |