diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:08 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:08 -0400 |
| commit | ff1b8ba01dc80da338890a187c112fdd3c0b9202 (patch) | |
| tree | 415999aa2c3ac52e48c2b6f690bba393e3d7a00c /arch/arm/mach-s3c2412/mach-smdk2413.c | |
| parent | 5fcdb16bd04fdeb313ee33bb269b04e59a9abf91 (diff) | |
| parent | 32b6cb3872883861f3a2669cce880f3a7ef8979a (diff) | |
ARM: Merge for-2635/gpio2
Merge branch 'for-2635/gpio2' into for-linus/samsung2
Diffstat (limited to 'arch/arm/mach-s3c2412/mach-smdk2413.c')
| -rw-r--r-- | arch/arm/mach-s3c2412/mach-smdk2413.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2412/mach-smdk2413.c b/arch/arm/mach-s3c2412/mach-smdk2413.c index 3d41aa74c36..ba93a356a83 100644 --- a/arch/arm/mach-s3c2412/mach-smdk2413.c +++ b/arch/arm/mach-s3c2412/mach-smdk2413.c | |||
| @@ -85,10 +85,10 @@ static void smdk2413_udc_pullup(enum s3c2410_udc_cmd_e cmd) | |||
| 85 | switch (cmd) | 85 | switch (cmd) |
| 86 | { | 86 | { |
| 87 | case S3C2410_UDC_P_ENABLE : | 87 | case S3C2410_UDC_P_ENABLE : |
| 88 | s3c2410_gpio_setpin(S3C2410_GPF(2), 1); | 88 | gpio_set_value(S3C2410_GPF(2), 1); |
| 89 | break; | 89 | break; |
| 90 | case S3C2410_UDC_P_DISABLE : | 90 | case S3C2410_UDC_P_DISABLE : |
| 91 | s3c2410_gpio_setpin(S3C2410_GPF(2), 0); | 91 | gpio_set_value(S3C2410_GPF(2), 0); |
| 92 | break; | 92 | break; |
| 93 | case S3C2410_UDC_P_RESET : | 93 | case S3C2410_UDC_P_RESET : |
| 94 | break; | 94 | break; |
| @@ -134,8 +134,8 @@ static void __init smdk2413_machine_init(void) | |||
| 134 | { /* Turn off suspend on both USB ports, and switch the | 134 | { /* Turn off suspend on both USB ports, and switch the |
| 135 | * selectable USB port to USB device mode. */ | 135 | * selectable USB port to USB device mode. */ |
| 136 | 136 | ||
| 137 | s3c2410_gpio_setpin(S3C2410_GPF(2), 0); | 137 | WARN_ON(gpio_request(S3C2410_GPF(2), "udc pull")); |
| 138 | s3c2410_gpio_cfgpin(S3C2410_GPF(2), S3C2410_GPIO_OUTPUT); | 138 | gpio_direction_output(S3C2410_GPF(2), 0); |
| 139 | 139 | ||
| 140 | s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST | | 140 | s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST | |
| 141 | S3C2410_MISCCR_USBSUSPND0 | | 141 | S3C2410_MISCCR_USBSUSPND0 | |