Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (172 commits)
  USB: Add support for SuperSpeed isoc endpoints
  xhci: Clean up cycle bit math used during stalls.
  xhci: Fix cycle bit calculation during stall handling.
  xhci: Update internal dequeue pointers after stalls.
  USB: Disable auto-suspend for USB 3.0 hubs.
  USB: Remove bogus USB_PORT_STAT_SUPER_SPEED symbol.
  xhci: Return canceled URBs immediately when host is halted.
  xhci: Fixes for suspend/resume of shared HCDs.
  xhci: Fix re-init on power loss after resume.
  xhci: Make roothub functions deal with device removal.
  xhci: Limit roothub ports to 15 USB3 & 31 USB2 ports.
  xhci: Return a USB 3.0 hub descriptor for USB3 roothub.
  xhci: Register second xHCI roothub.
  xhci: Change xhci_find_slot_id_by_port() API.
  xhci: Refactor bus suspend state into a struct.
  xhci: Index with a port array instead of PORTSC addresses.
  USB: Set usb_hcd->state and flags for shared roothubs.
  usb: Make core allocate resources per PCI-device.
  usb: Store bus type in usb_hcd, not in driver flags.
  usb: Change usb_hcd->bandwidth_mutex to a pointer.
  ...

3 files changed, 4 insertions, 63 deletions

diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
index 9f2c14ec718..37405d9abe3 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -455,28 +455,10 @@ static struct s3c2410_platform_nand __initdata gta02_nand_info = {
 };
 
 
-static void gta02_udc_command(enum s3c2410_udc_cmd_e cmd)
-{
-        switch (cmd) {
-        case S3C2410_UDC_P_ENABLE:
-                pr_debug("%s S3C2410_UDC_P_ENABLE\n", __func__);
-                gpio_direction_output(GTA02_GPIO_USB_PULLUP, 1);
-                break;
-        case S3C2410_UDC_P_DISABLE:
-                pr_debug("%s S3C2410_UDC_P_DISABLE\n", __func__);
-                gpio_direction_output(GTA02_GPIO_USB_PULLUP, 0);
-                break;
-        case S3C2410_UDC_P_RESET:
-                pr_debug("%s S3C2410_UDC_P_RESET\n", __func__);
-                /* FIXME: Do something here. */
-        }
-}
-
 /* Get PMU to set USB current limit accordingly. */
-static struct s3c2410_udc_mach_info gta02_udc_cfg = {
+static struct s3c2410_udc_mach_info gta02_udc_cfg __initdata = {
         .vbus_draw      = gta02_udc_vbus_draw,
-        .udc_command    = gta02_udc_command,
-
+        .pullup_pin = GTA02_GPIO_USB_PULLUP,
 };
 
 /* USB */
diff --git a/arch/arm/mach-s3c2440/mach-mini2440.c b/arch/arm/mach-s3c2440/mach-mini2440.c
index f62bb4c793b..d80f129bca9 100644
--- a/arch/arm/mach-s3c2440/mach-mini2440.c
+++ b/arch/arm/mach-s3c2440/mach-mini2440.c
@@ -97,26 +97,8 @@ static struct s3c2410_uartcfg mini2440_uartcfgs[] __initdata = {
 
 /* USB device UDC support */
 
-static void mini2440_udc_pullup(enum s3c2410_udc_cmd_e cmd)
-{
-        pr_debug("udc: pullup(%d)\n", cmd);
-
-        switch (cmd) {
-                case S3C2410_UDC_P_ENABLE :
-                        gpio_set_value(S3C2410_GPC(5), 1);
-                        break;
-                case S3C2410_UDC_P_DISABLE :
-                        gpio_set_value(S3C2410_GPC(5), 0);
-                        break;
-                case S3C2410_UDC_P_RESET :
-                        break;
-                default:
-                        break;
-        }
-}
-
 static struct s3c2410_udc_mach_info mini2440_udc_cfg __initdata = {
-        .udc_command            = mini2440_udc_pullup,
+        .pullup_pin = S3C2410_GPC(5),
 };
 
 
@@ -644,10 +626,6 @@ static void __init mini2440_init(void)
         s3c2410_gpio_setpin(S3C2410_GPB(1), 0);
         s3c_gpio_cfgpin(S3C2410_GPB(1), S3C2410_GPIO_INPUT);
 
-        /* Make sure the D+ pullup pin is output */
-        WARN_ON(gpio_request(S3C2410_GPC(5), "udc pup"));
-        gpio_direction_output(S3C2410_GPC(5), 0);
-
         /* mark the key as input, without pullups (there is one on the board) */
         for (i = 0; i < ARRAY_SIZE(mini2440_buttons); i++) {
                 s3c_gpio_setpull(mini2440_buttons[i].gpio, S3C_GPIO_PULL_UP);
diff --git a/arch/arm/mach-s3c2440/mach-rx1950.c b/arch/arm/mach-s3c2440/mach-rx1950.c
index eab6ae50683..86bbc233b31 100644
--- a/arch/arm/mach-s3c2440/mach-rx1950.c
+++ b/arch/arm/mach-s3c2440/mach-rx1950.c
@@ -566,26 +566,10 @@ static struct s3c2410_platform_nand rx1950_nand_info = {
         .sets = rx1950_nand_sets,
 };
 
-static void rx1950_udc_pullup(enum s3c2410_udc_cmd_e cmd)
-{
-        switch (cmd) {
-        case S3C2410_UDC_P_ENABLE:
-                gpio_direction_output(S3C2410_GPJ(5), 1);
-                break;
-        case S3C2410_UDC_P_DISABLE:
-                gpio_direction_output(S3C2410_GPJ(5), 0);
-                break;
-        case S3C2410_UDC_P_RESET:
-                break;
-        default:
-                break;
-        }
-}
-
 static struct s3c2410_udc_mach_info rx1950_udc_cfg __initdata = {
-        .udc_command = rx1950_udc_pullup,
         .vbus_pin = S3C2410_GPG(5),
         .vbus_pin_inverted = 1,
+        .pullup_pin = S3C2410_GPJ(5),
 };
 
 static struct s3c2410_ts_mach_info rx1950_ts_cfg __initdata = {
@@ -750,9 +734,6 @@ static void __init rx1950_init_machine(void)
                                                 S3C2410_MISCCR_USBSUSPND0 |
                                                 S3C2410_MISCCR_USBSUSPND1, 0x0);
 
-        WARN_ON(gpio_request(S3C2410_GPJ(5), "UDC pullup"));
-        gpio_direction_output(S3C2410_GPJ(5), 0);
-
         /* mmc power is disabled by default */
         WARN_ON(gpio_request(S3C2410_GPJ(1), "MMC power"));
         gpio_direction_output(S3C2410_GPJ(1), 0);