1 files changed, 66 insertions, 10 deletions

diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
index c2448950a8d8..6d8b04061d5d 100644
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -902,7 +902,7 @@ static irqreturn_t s3c2410_udc_irq(int dummy, void *_dev)
         int pwr_reg;
         int ep0csr;
         int i;
-        u32 idx;
+        u32 idx, idx2;
         unsigned long flags;
 
         spin_lock_irqsave(&dev->lock, flags);
@@ -1017,6 +1017,20 @@ static irqreturn_t s3c2410_udc_irq(int dummy, void *_dev)
                 }
         }
 
+        /* what else causes this interrupt? a receive! who is it? */
+        if (!usb_status && !usbd_status && !pwr_reg && !ep0csr) {
+                for (i = 1; i < S3C2410_ENDPOINTS; i++) {
+                        idx2 = udc_read(S3C2410_UDC_INDEX_REG);
+                        udc_write(i, S3C2410_UDC_INDEX_REG);
+
+                        if (udc_read(S3C2410_UDC_OUT_CSR1_REG) & 0x1)
+                                s3c2410_udc_handle_ep(&dev->ep[i]);
+
+                        /* restore index */
+                        udc_write(idx2, S3C2410_UDC_INDEX_REG);
+                }
+        }
+
         dprintk(DEBUG_VERBOSE, "irq: %d s3c2410_udc_done.\n", IRQ_USBD);
 
         /* Restore old index */
@@ -1467,7 +1481,9 @@ static int s3c2410_udc_set_pullup(struct s3c2410_udc *udc, int is_on)
 {
         dprintk(DEBUG_NORMAL, "%s()\n", __func__);
 
-        if (udc_info && udc_info->udc_command) {
+        if (udc_info && (udc_info->udc_command ||
+                gpio_is_valid(udc_info->pullup_pin))) {
+
                 if (is_on)
                         s3c2410_udc_enable(udc);
                 else {
@@ -1544,6 +1560,32 @@ static const struct usb_gadget_ops s3c2410_ops = {
         .vbus_draw              = s3c2410_vbus_draw,
 };
 
+static void s3c2410_udc_command(enum s3c2410_udc_cmd_e cmd)
+{
+        if (!udc_info)
+                return;
+
+        if (udc_info->udc_command) {
+                udc_info->udc_command(S3C2410_UDC_P_DISABLE);
+        } else if (gpio_is_valid(udc_info->pullup_pin)) {
+                int value;
+
+                switch (cmd) {
+                case S3C2410_UDC_P_ENABLE:
+                        value = 1;
+                        break;
+                case S3C2410_UDC_P_DISABLE:
+                        value = 0;
+                        break;
+                default:
+                        return;
+                }
+                value ^= udc_info->pullup_pin_inverted;
+
+                gpio_set_value(udc_info->pullup_pin, value);
+        }
+}
+
 /*------------------------- gadget driver handling---------------------------*/
 /*
  * s3c2410_udc_disable
@@ -1565,8 +1607,7 @@ static void s3c2410_udc_disable(struct s3c2410_udc *dev)
         udc_write(0x1F, S3C2410_UDC_EP_INT_REG);
 
         /* Good bye, cruel world */
-        if (udc_info && udc_info->udc_command)
-                udc_info->udc_command(S3C2410_UDC_P_DISABLE);
+        s3c2410_udc_command(S3C2410_UDC_P_DISABLE);
 
         /* Set speed to unknown */
         dev->gadget.speed = USB_SPEED_UNKNOWN;
@@ -1627,8 +1668,7 @@ static void s3c2410_udc_enable(struct s3c2410_udc *dev)
         udc_write(S3C2410_UDC_INT_EP0, S3C2410_UDC_EP_INT_EN_REG);
 
         /* time to say "hello, world" */
-        if (udc_info && udc_info->udc_command)
-                udc_info->udc_command(S3C2410_UDC_P_ENABLE);
+        s3c2410_udc_command(S3C2410_UDC_P_ENABLE);
 }
 
 /*
@@ -1903,6 +1943,17 @@ static int s3c2410_udc_probe(struct platform_device *pdev)
                 udc->vbus = 1;
         }
 
+        if (udc_info && !udc_info->udc_command &&
+                gpio_is_valid(udc_info->pullup_pin)) {
+
+                retval = gpio_request_one(udc_info->pullup_pin,
+                                udc_info->vbus_pin_inverted ?
+                                GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW,
+                                "udc pullup");
+                if (retval)
+                        goto err_vbus_irq;
+        }
+
         if (s3c2410_udc_debugfs_root) {
                 udc->regs_info = debugfs_create_file("registers", S_IRUGO,
                                 s3c2410_udc_debugfs_root,
@@ -1915,6 +1966,9 @@ static int s3c2410_udc_probe(struct platform_device *pdev)
 
         return 0;
 
+err_vbus_irq:
+        if (udc_info && udc_info->vbus_pin > 0)
+                free_irq(gpio_to_irq(udc_info->vbus_pin), udc);
 err_gpio_claim:
         if (udc_info && udc_info->vbus_pin > 0)
                 gpio_free(udc_info->vbus_pin);
@@ -1942,6 +1996,10 @@ static int s3c2410_udc_remove(struct platform_device *pdev)
 
         debugfs_remove(udc->regs_info);
 
+        if (udc_info && !udc_info->udc_command &&
+                gpio_is_valid(udc_info->pullup_pin))
+                gpio_free(udc_info->pullup_pin);
+
         if (udc_info && udc_info->vbus_pin > 0) {
                 irq = gpio_to_irq(udc_info->vbus_pin);
                 free_irq(irq, udc);
@@ -1973,16 +2031,14 @@ static int s3c2410_udc_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int s3c2410_udc_suspend(struct platform_device *pdev, pm_message_t message)
 {
-        if (udc_info && udc_info->udc_command)
-                udc_info->udc_command(S3C2410_UDC_P_DISABLE);
+        s3c2410_udc_command(S3C2410_UDC_P_DISABLE);
 
         return 0;
 }
 
 static int s3c2410_udc_resume(struct platform_device *pdev)
 {
-        if (udc_info && udc_info->udc_command)
-                udc_info->udc_command(S3C2410_UDC_P_ENABLE);
+        s3c2410_udc_command(S3C2410_UDC_P_ENABLE);
 
         return 0;
 }