14 files changed, 152 insertions, 132 deletions

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index c13955164686..d681bb27fa58 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -118,10 +118,10 @@ config USB_AMD5536UDC
 config USB_GADGET_ATMEL_USBA
         boolean "Atmel USBA"
         select USB_GADGET_DUALSPEED
-        depends on AVR32
+        depends on AVR32 || ARCH_AT91CAP9
         help
           USBA is the integrated high-speed USB Device controller on
-          the AT32AP700x processors from Atmel.
+          the AT32AP700x and AT91CAP9 processors from Atmel.
 
 config USB_ATMEL_USBA
         tristate
@@ -131,7 +131,7 @@ config USB_ATMEL_USBA
 
 config USB_GADGET_FSL_USB2
         boolean "Freescale Highspeed USB DR Peripheral Controller"
-        depends on MPC834x || PPC_MPC831x
+        depends on FSL_SOC
         select USB_GADGET_DUALSPEED
         help
            Some of Freescale PowerPC processors have a High Speed
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index a83e8b798ec9..fd15ced899d8 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -1884,3 +1884,4 @@ module_exit(udc_exit_module);
 MODULE_DESCRIPTION("AT91 udc driver");
 MODULE_AUTHOR("Thomas Rathbone, David Brownell");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:at91_udc");
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index af8b2a3a2d4a..e756023362c2 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -18,6 +18,7 @@
 #include <linux/platform_device.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
+#include <linux/usb/atmel_usba_udc.h>
 #include <linux/delay.h>
 
 #include <asm/gpio.h>
@@ -27,6 +28,7 @@
 
 
 static struct usba_udc the_udc;
+static struct usba_ep *usba_ep;
 
 #ifdef CONFIG_USB_GADGET_DEBUG_FS
 #include <linux/debugfs.h>
@@ -324,53 +326,28 @@ static int vbus_is_present(struct usba_udc *udc)
         return 1;
 }
 
-static void copy_to_fifo(void __iomem *fifo, const void *buf, int len)
+#if defined(CONFIG_AVR32)
+
+static void toggle_bias(int is_on)
 {
-        unsigned long tmp;
-
-        DBG(DBG_FIFO, "copy to FIFO (len %d):\n", len);
-        for (; len > 0; len -= 4, buf += 4, fifo += 4) {
-                tmp = *(unsigned long *)buf;
-                if (len >= 4) {
-                        DBG(DBG_FIFO, "  -> %08lx\n", tmp);
-                        __raw_writel(tmp, fifo);
-                } else {
-                        do {
-                                DBG(DBG_FIFO, "  -> %02lx\n", tmp >> 24);
-                                __raw_writeb(tmp >> 24, fifo);
-                                fifo++;
-                                tmp <<= 8;
-                        } while (--len);
-                        break;
-                }
-        }
 }
 
-static void copy_from_fifo(void *buf, void __iomem *fifo, int len)
+#elif defined(CONFIG_ARCH_AT91)
+
+#include <asm/arch/at91_pmc.h>
+
+static void toggle_bias(int is_on)
 {
-        union {
-                unsigned long *w;
-                unsigned char *b;
-        } p;
-        unsigned long tmp;
-
-        DBG(DBG_FIFO, "copy from FIFO (len %d):\n", len);
-        for (p.w = buf; len > 0; len -= 4, p.w++, fifo += 4) {
-                if (len >= 4) {
-                        tmp = __raw_readl(fifo);
-                        *p.w = tmp;
-                        DBG(DBG_FIFO, "  -> %08lx\n", tmp);
-                } else {
-                        do {
-                                tmp = __raw_readb(fifo);
-                                *p.b = tmp;
-                                DBG(DBG_FIFO, " -> %02lx\n", tmp);
-                                fifo++, p.b++;
-                        } while (--len);
-                }
-        }
+        unsigned int uckr = at91_sys_read(AT91_CKGR_UCKR);
+
+        if (is_on)
+                at91_sys_write(AT91_CKGR_UCKR, uckr | AT91_PMC_BIASEN);
+        else
+                at91_sys_write(AT91_CKGR_UCKR, uckr & ~(AT91_PMC_BIASEN));
 }
 
+#endif /* CONFIG_ARCH_AT91 */
+
 static void next_fifo_transaction(struct usba_ep *ep, struct usba_request *req)
 {
         unsigned int transaction_len;
@@ -387,7 +364,7 @@ static void next_fifo_transaction(struct usba_ep *ep, struct usba_request *req)
                 ep->ep.name, req, transaction_len,
                 req->last_transaction ? ", done" : "");
 
-        copy_to_fifo(ep->fifo, req->req.buf + req->req.actual, transaction_len);
+        memcpy_toio(ep->fifo, req->req.buf + req->req.actual, transaction_len);
         usba_ep_writel(ep, SET_STA, USBA_TX_PK_RDY);
         req->req.actual += transaction_len;
 }
@@ -476,7 +453,7 @@ static void receive_data(struct usba_ep *ep)
                         bytecount = req->req.length - req->req.actual;
                 }
 
-                copy_from_fifo(req->req.buf + req->req.actual,
+                memcpy_fromio(req->req.buf + req->req.actual,
                                 ep->fifo, bytecount);
                 req->req.actual += bytecount;
 
@@ -1029,33 +1006,6 @@ static const struct usb_gadget_ops usba_udc_ops = {
         .set_selfpowered        = usba_udc_set_selfpowered,
 };
 
-#define EP(nam, idx, maxpkt, maxbk, dma, isoc)                  \
-{                                                               \
-        .ep     = {                                             \
-                .ops            = &usba_ep_ops,                 \
-                .name           = nam,                          \
-                .maxpacket      = maxpkt,                       \
-        },                                                      \
-        .udc            = &the_udc,                             \
-        .queue          = LIST_HEAD_INIT(usba_ep[idx].queue),   \
-        .fifo_size      = maxpkt,                               \
-        .nr_banks       = maxbk,                                \
-        .index          = idx,                                  \
-        .can_dma        = dma,                                  \
-        .can_isoc       = isoc,                                 \
-}
-
-static struct usba_ep usba_ep[] = {
-        EP("ep0", 0, 64, 1, 0, 0),
-        EP("ep1in-bulk", 1, 512, 2, 1, 1),
-        EP("ep2out-bulk", 2, 512, 2, 1, 1),
-        EP("ep3in-int", 3, 64, 3, 1, 0),
-        EP("ep4out-int", 4, 64, 3, 1, 0),
-        EP("ep5in-iso", 5, 1024, 3, 1, 1),
-        EP("ep6out-iso", 6, 1024, 3, 1, 1),
-};
-#undef EP
-
 static struct usb_endpoint_descriptor usba_ep0_desc = {
         .bLength = USB_DT_ENDPOINT_SIZE,
         .bDescriptorType = USB_DT_ENDPOINT,
@@ -1074,7 +1024,6 @@ static void nop_release(struct device *dev)
 static struct usba_udc the_udc = {
         .gadget = {
                 .ops            = &usba_udc_ops,
-                .ep0            = &usba_ep[0].ep,
                 .ep_list        = LIST_HEAD_INIT(the_udc.gadget.ep_list),
                 .is_dualspeed   = 1,
                 .name           = "atmel_usba_udc",
@@ -1231,7 +1180,7 @@ static int do_test_mode(struct usba_udc *udc)
                 } else {
                         usba_ep_writel(ep, CTL_ENB, USBA_EPT_ENABLE);
                         usba_writel(udc, TST, USBA_TST_PKT_MODE);
-                        copy_to_fifo(ep->fifo, test_packet_buffer,
+                        memcpy_toio(ep->fifo, test_packet_buffer,
                                         sizeof(test_packet_buffer));
                         usba_ep_writel(ep, SET_STA, USBA_TX_PK_RDY);
                         dev_info(dev, "Entering Test_Packet mode...\n");
@@ -1530,13 +1479,13 @@ restart:
                 DBG(DBG_HW, "Packet length: %u\n", pkt_len);
                 if (pkt_len != sizeof(crq)) {
                         pr_warning("udc: Invalid packet length %u "
-                                "(expected %lu)\n", pkt_len, sizeof(crq));
+                                "(expected %zu)\n", pkt_len, sizeof(crq));
                         set_protocol_stall(udc, ep);
                         return;
                 }
 
                 DBG(DBG_FIFO, "Copying ctrl request from 0x%p:\n", ep->fifo);
-                copy_from_fifo(crq.data, ep->fifo, sizeof(crq));
+                memcpy_fromio(crq.data, ep->fifo, sizeof(crq));
 
                 /* Free up one bank in the FIFO so that we can
                  * generate or receive a reply right away. */
@@ -1688,6 +1637,7 @@ static irqreturn_t usba_udc_irq(int irq, void *devid)
         DBG(DBG_INT, "irq, status=%#08x\n", status);
 
         if (status & USBA_DET_SUSPEND) {
+                toggle_bias(0);
                 usba_writel(udc, INT_CLR, USBA_DET_SUSPEND);
                 DBG(DBG_BUS, "Suspend detected\n");
                 if (udc->gadget.speed != USB_SPEED_UNKNOWN
@@ -1699,6 +1649,7 @@ static irqreturn_t usba_udc_irq(int irq, void *devid)
         }
 
         if (status & USBA_WAKE_UP) {
+                toggle_bias(1);
                 usba_writel(udc, INT_CLR, USBA_WAKE_UP);
                 DBG(DBG_BUS, "Wake Up CPU detected\n");
         }
@@ -1792,12 +1743,14 @@ static irqreturn_t usba_vbus_irq(int irq, void *devid)
         vbus = gpio_get_value(udc->vbus_pin);
         if (vbus != udc->vbus_prev) {
                 if (vbus) {
-                        usba_writel(udc, CTRL, USBA_EN_USBA);
+                        toggle_bias(1);
+                        usba_writel(udc, CTRL, USBA_ENABLE_MASK);
                         usba_writel(udc, INT_ENB, USBA_END_OF_RESET);
                 } else {
                         udc->gadget.speed = USB_SPEED_UNKNOWN;
                         reset_all_endpoints(udc);
-                        usba_writel(udc, CTRL, 0);
+                        toggle_bias(0);
+                        usba_writel(udc, CTRL, USBA_DISABLE_MASK);
                         spin_unlock(&udc->lock);
                         udc->driver->disconnect(&udc->gadget);
                         spin_lock(&udc->lock);
@@ -1850,7 +1803,8 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
         /* If Vbus is present, enable the controller and wait for reset */
         spin_lock_irqsave(&udc->lock, flags);
         if (vbus_is_present(udc) && udc->vbus_prev == 0) {
-                usba_writel(udc, CTRL, USBA_EN_USBA);
+                toggle_bias(1);
+                usba_writel(udc, CTRL, USBA_ENABLE_MASK);
                 usba_writel(udc, INT_ENB, USBA_END_OF_RESET);
         }
         spin_unlock_irqrestore(&udc->lock, flags);
@@ -1883,7 +1837,8 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
         spin_unlock_irqrestore(&udc->lock, flags);
 
         /* This will also disable the DP pullup */
-        usba_writel(udc, CTRL, 0);
+        toggle_bias(0);
+        usba_writel(udc, CTRL, USBA_DISABLE_MASK);
 
         driver->unbind(&udc->gadget);
         udc->gadget.dev.driver = NULL;
@@ -1908,7 +1863,7 @@ static int __init usba_udc_probe(struct platform_device *pdev)
 
         regs = platform_get_resource(pdev, IORESOURCE_MEM, CTRL_IOMEM_ID);
         fifo = platform_get_resource(pdev, IORESOURCE_MEM, FIFO_IOMEM_ID);
-        if (!regs || !fifo)
+        if (!regs || !fifo || !pdata)
                 return -ENXIO;
 
         irq = platform_get_irq(pdev, 0);
@@ -1953,19 +1908,48 @@ static int __init usba_udc_probe(struct platform_device *pdev)
 
         /* Make sure we start from a clean slate */
         clk_enable(pclk);
-        usba_writel(udc, CTRL, 0);
+        toggle_bias(0);
+        usba_writel(udc, CTRL, USBA_DISABLE_MASK);
         clk_disable(pclk);
 
+        usba_ep = kmalloc(sizeof(struct usba_ep) * pdata->num_ep,
+                          GFP_KERNEL);
+        if (!usba_ep)
+                goto err_alloc_ep;
+
+        the_udc.gadget.ep0 = &usba_ep[0].ep;
+
         INIT_LIST_HEAD(&usba_ep[0].ep.ep_list);
         usba_ep[0].ep_regs = udc->regs + USBA_EPT_BASE(0);
         usba_ep[0].dma_regs = udc->regs + USBA_DMA_BASE(0);
         usba_ep[0].fifo = udc->fifo + USBA_FIFO_BASE(0);
-        for (i = 1; i < ARRAY_SIZE(usba_ep); i++) {
+        usba_ep[0].ep.ops = &usba_ep_ops;
+        usba_ep[0].ep.name = pdata->ep[0].name;
+        usba_ep[0].ep.maxpacket = pdata->ep[0].fifo_size;
+        usba_ep[0].udc = &the_udc;
+        INIT_LIST_HEAD(&usba_ep[0].queue);
+        usba_ep[0].fifo_size = pdata->ep[0].fifo_size;
+        usba_ep[0].nr_banks = pdata->ep[0].nr_banks;
+        usba_ep[0].index = pdata->ep[0].index;
+        usba_ep[0].can_dma = pdata->ep[0].can_dma;
+        usba_ep[0].can_isoc = pdata->ep[0].can_isoc;
+
+        for (i = 1; i < pdata->num_ep; i++) {
                 struct usba_ep *ep = &usba_ep[i];
 
                 ep->ep_regs = udc->regs + USBA_EPT_BASE(i);
                 ep->dma_regs = udc->regs + USBA_DMA_BASE(i);
                 ep->fifo = udc->fifo + USBA_FIFO_BASE(i);
+                ep->ep.ops = &usba_ep_ops;
+                ep->ep.name = pdata->ep[i].name;
+                ep->ep.maxpacket = pdata->ep[i].fifo_size;
+                ep->udc = &the_udc;
+                INIT_LIST_HEAD(&ep->queue);
+                ep->fifo_size = pdata->ep[i].fifo_size;
+                ep->nr_banks = pdata->ep[i].nr_banks;
+                ep->index = pdata->ep[i].index;
+                ep->can_dma = pdata->ep[i].can_dma;
+                ep->can_isoc = pdata->ep[i].can_isoc;
 
                 list_add_tail(&ep->ep.ep_list, &udc->gadget.ep_list);
         }
@@ -1984,7 +1968,7 @@ static int __init usba_udc_probe(struct platform_device *pdev)
                 goto err_device_add;
         }
 
-        if (pdata && pdata->vbus_pin != GPIO_PIN_NONE) {
+        if (pdata->vbus_pin >= 0) {
                 if (!gpio_request(pdata->vbus_pin, "atmel_usba_udc")) {
                         udc->vbus_pin = pdata->vbus_pin;
 
@@ -2004,7 +1988,7 @@ static int __init usba_udc_probe(struct platform_device *pdev)
         }
 
         usba_init_debugfs(udc);
-        for (i = 1; i < ARRAY_SIZE(usba_ep); i++)
+        for (i = 1; i < pdata->num_ep; i++)
                 usba_ep_init_debugfs(udc, &usba_ep[i]);
 
         return 0;
@@ -2012,6 +1996,8 @@ static int __init usba_udc_probe(struct platform_device *pdev)
 err_device_add:
         free_irq(irq, udc);
 err_request_irq:
+        kfree(usba_ep);
+err_alloc_ep:
         iounmap(udc->fifo);
 err_map_fifo:
         iounmap(udc->regs);
@@ -2029,10 +2015,11 @@ static int __exit usba_udc_remove(struct platform_device *pdev)
 {
         struct usba_udc *udc;
         int i;
+        struct usba_platform_data *pdata = pdev->dev.platform_data;
 
         udc = platform_get_drvdata(pdev);
 
-        for (i = 1; i < ARRAY_SIZE(usba_ep); i++)
+        for (i = 1; i < pdata->num_ep; i++)
                 usba_ep_cleanup_debugfs(&usba_ep[i]);
         usba_cleanup_debugfs(udc);
 
@@ -2040,6 +2027,7 @@ static int __exit usba_udc_remove(struct platform_device *pdev)
                 gpio_free(udc->vbus_pin);
 
         free_irq(udc->irq, udc);
+        kfree(usba_ep);
         iounmap(udc->fifo);
         iounmap(udc->regs);
         clk_put(udc->hclk);
@@ -2054,6 +2042,7 @@ static struct platform_driver udc_driver = {
         .remove         = __exit_p(usba_udc_remove),
         .driver         = {
                 .name           = "atmel_usba_udc",
+                .owner          = THIS_MODULE,
         },
 };
 
@@ -2072,3 +2061,4 @@ module_exit(udc_exit);
 MODULE_DESCRIPTION("Atmel USBA UDC driver");
 MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:atmel_usba_udc");
diff --git a/drivers/usb/gadget/atmel_usba_udc.h b/drivers/usb/gadget/atmel_usba_udc.h
index 08bf6f9aaf7e..f7baea307f0d 100644
--- a/drivers/usb/gadget/atmel_usba_udc.h
+++ b/drivers/usb/gadget/atmel_usba_udc.h
@@ -41,6 +41,15 @@
 #define USBA_EN_USBA                            (1 <<  8)
 #define USBA_DETACH                             (1 <<  9)
 #define USBA_REMOTE_WAKE_UP                     (1 << 10)
+#define USBA_PULLD_DIS                          (1 << 11)
+
+#if defined(CONFIG_AVR32)
+#define USBA_ENABLE_MASK                        USBA_EN_USBA
+#define USBA_DISABLE_MASK                       0
+#elif defined(CONFIG_ARCH_AT91)
+#define USBA_ENABLE_MASK                        (USBA_EN_USBA | USBA_PULLD_DIS)
+#define USBA_DISABLE_MASK                       USBA_DETACH
+#endif /* CONFIG_ARCH_AT91 */
 
 /* Bitfields in FNUM */
 #define USBA_MICRO_FRAME_NUM_OFFSET             0
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index a70e255402b8..e99872308144 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -1561,6 +1561,7 @@ done_set_intf:
                                 memcpy(req->buf, buf, n);
                                 req->complete = rndis_response_complete;
                                 rndis_free_response(dev->rndis_config, buf);
+                                value = n;
                         }
                         /* else stalls ... spec says to avoid that */
                 }
diff --git a/drivers/usb/gadget/fsl_usb2_udc.c b/drivers/usb/gadget/fsl_usb2_udc.c
index 63e8fa3a69e1..254012ad2b91 100644
--- a/drivers/usb/gadget/fsl_usb2_udc.c
+++ b/drivers/usb/gadget/fsl_usb2_udc.c
@@ -2475,3 +2475,4 @@ module_exit(udc_exit);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:fsl-usb2-udc");
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 805602a687cb..0a6feafc8d28 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1458,7 +1458,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
         /* currently one config, two speeds */
         case USB_REQ_SET_CONFIGURATION:
                 if (ctrl->bRequestType != 0)
-                        break;
+                        goto unrecognized;
                 if (0 == (u8) w_value) {
                         value = 0;
                         dev->current_config = 0;
@@ -1505,7 +1505,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
         /* PXA automagically handles this request too */
         case USB_REQ_GET_CONFIGURATION:
                 if (ctrl->bRequestType != 0x80)
-                        break;
+                        goto unrecognized;
                 *(u8 *)req->buf = dev->current_config;
                 value = min (w_length, (u16) 1);
                 break;
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c
index 37243ef7104e..078f72467671 100644
--- a/drivers/usb/gadget/lh7a40x_udc.c
+++ b/drivers/usb/gadget/lh7a40x_udc.c
@@ -2146,3 +2146,4 @@ module_exit(udc_exit);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_AUTHOR("Mikko Lahteenmaki, Bo Henriksen");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:lh7a40x_udc");
diff --git a/drivers/usb/gadget/m66592-udc.c b/drivers/usb/gadget/m66592-udc.c
index 835948f0715a..ee6b35fa870f 100644
--- a/drivers/usb/gadget/m66592-udc.c
+++ b/drivers/usb/gadget/m66592-udc.c
@@ -35,6 +35,7 @@
 MODULE_DESCRIPTION("M66592 USB gadget driver");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Yoshihiro Shimoda");
+MODULE_ALIAS("platform:m66592_udc");
 
 #define DRIVER_VERSION  "18 Oct 2007"
 
@@ -1671,6 +1672,7 @@ static struct platform_driver m66592_driver = {
         .remove =       __exit_p(m66592_remove),
         .driver         = {
                 .name = (char *) udc_name,
+                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index e6d68bda428a..ee1e9a314cd1 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -3109,4 +3109,4 @@ module_exit(udc_exit);
 
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
-
+MODULE_ALIAS("platform:omap_udc");
diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c
index 9fdabc8fcac4..2c32bd08ee7d 100644
--- a/drivers/usb/gadget/printer.c
+++ b/drivers/usb/gadget/printer.c
@@ -92,7 +92,6 @@ struct printer_dev {
         u8                      *current_rx_buf;
         u8                      printer_status;
         u8                      reset_printer;
-        struct class_device     *printer_class_dev;
         struct cdev             printer_cdev;
         struct device           *pdev;
         u8                      printer_cdev_open;
@@ -1299,7 +1298,7 @@ printer_unbind(struct usb_gadget *gadget)
                 printer_req_free(dev->in_ep, req);
         }
 
-        if (dev->current_rx_req != NULL);
+        if (dev->current_rx_req != NULL)
                 printer_req_free(dev->out_ep, dev->current_rx_req);
 
         while (!list_empty(&dev->rx_reqs)) {
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index 4402d6f042d9..c00cd8b9d3d1 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -103,6 +103,12 @@ static const char ep0name [] = "ep0";
 #error "Can't configure both IXP and PXA"
 #endif
 
+/* IXP doesn't yet support <linux/clk.h> */
+#define clk_get(dev,name)       NULL
+#define clk_enable(clk)         do { } while (0)
+#define clk_disable(clk)        do { } while (0)
+#define clk_put(clk)            do { } while (0)
+
 #endif
 
 #include "pxa2xx_udc.h"
@@ -934,20 +940,31 @@ static void udc_disable(struct pxa2xx_udc *);
 /* We disable the UDC -- and its 48 MHz clock -- whenever it's not
  * in active use.
  */
-static int pullup(struct pxa2xx_udc *udc, int is_active)
+static int pullup(struct pxa2xx_udc *udc)
 {
-        is_active = is_active && udc->vbus && udc->pullup;
+        int is_active = udc->vbus && udc->pullup && !udc->suspended;
         DMSG("%s\n", is_active ? "active" : "inactive");
-        if (is_active)
-                udc_enable(udc);
-        else {
-                if (udc->gadget.speed != USB_SPEED_UNKNOWN) {
-                        DMSG("disconnect %s\n", udc->driver
-                                ? udc->driver->driver.name
-                                : "(no driver)");
-                        stop_activity(udc, udc->driver);
+        if (is_active) {
+                if (!udc->active) {
+                        udc->active = 1;
+                        /* Enable clock for USB device */
+                        clk_enable(udc->clk);
+                        udc_enable(udc);
                 }
-                udc_disable(udc);
+        } else {
+                if (udc->active) {
+                        if (udc->gadget.speed != USB_SPEED_UNKNOWN) {
+                                DMSG("disconnect %s\n", udc->driver
+                                        ? udc->driver->driver.name
+                                        : "(no driver)");
+                                stop_activity(udc, udc->driver);
+                        }
+                        udc_disable(udc);
+                        /* Disable clock for USB device */
+                        clk_disable(udc->clk);
+                        udc->active = 0;
+                }
+
         }
         return 0;
 }
@@ -958,9 +975,9 @@ static int pxa2xx_udc_vbus_session(struct usb_gadget *_gadget, int is_active)
         struct pxa2xx_udc       *udc;
 
         udc = container_of(_gadget, struct pxa2xx_udc, gadget);
-        udc->vbus = is_active = (is_active != 0);
+        udc->vbus = (is_active != 0);
         DMSG("vbus %s\n", is_active ? "supplied" : "inactive");
-        pullup(udc, is_active);
+        pullup(udc);
         return 0;
 }
 
@@ -975,9 +992,8 @@ static int pxa2xx_udc_pullup(struct usb_gadget *_gadget, int is_active)
         if (!udc->mach->gpio_pullup && !udc->mach->udc_command)
                 return -EOPNOTSUPP;
 
-        is_active = (is_active != 0);
-        udc->pullup = is_active;
-        pullup(udc, is_active);
+        udc->pullup = (is_active != 0);
+        pullup(udc);
         return 0;
 }
 
@@ -997,7 +1013,7 @@ static const struct usb_gadget_ops pxa2xx_udc_ops = {
 #ifdef CONFIG_USB_GADGET_DEBUG_FS
 
 static int
-udc_seq_show(struct seq_file *m, void *d)
+udc_seq_show(struct seq_file *m, void *_d)
 {
         struct pxa2xx_udc       *dev = m->private;
         unsigned long           flags;
@@ -1146,11 +1162,6 @@ static void udc_disable(struct pxa2xx_udc *dev)
 
         udc_clear_mask_UDCCR(UDCCR_UDE);
 
-#ifdef  CONFIG_ARCH_PXA
-        /* Disable clock for USB device */
-        clk_disable(dev->clk);
-#endif
-
         ep0_idle (dev);
         dev->gadget.speed = USB_SPEED_UNKNOWN;
 }
@@ -1191,11 +1202,6 @@ static void udc_enable (struct pxa2xx_udc *dev)
 {
         udc_clear_mask_UDCCR(UDCCR_UDE);
 
-#ifdef  CONFIG_ARCH_PXA
-        /* Enable clock for USB device */
-        clk_enable(dev->clk);
-#endif
-
         /* try to clear these bits before we enable the udc */
         udc_ack_int_UDCCR(UDCCR_SUSIR|/*UDCCR_RSTIR|*/UDCCR_RESIR);
 
@@ -1286,7 +1292,7 @@ fail:
          * for set_configuration as well as eventual disconnect.
          */
         DMSG("registered gadget driver '%s'\n", driver->driver.name);
-        pullup(dev, 1);
+        pullup(dev);
         dump_state(dev);
         return 0;
 }
@@ -1329,7 +1335,8 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
                 return -EINVAL;
 
         local_irq_disable();
-        pullup(dev, 0);
+        dev->pullup = 0;
+        pullup(dev);
         stop_activity(dev, driver);
         local_irq_enable();
 
@@ -2131,13 +2138,11 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)
         if (irq < 0)
                 return -ENODEV;
 
-#ifdef  CONFIG_ARCH_PXA
         dev->clk = clk_get(&pdev->dev, "UDCCLK");
         if (IS_ERR(dev->clk)) {
                 retval = PTR_ERR(dev->clk);
                 goto err_clk;
         }
-#endif
 
         pr_debug("%s: IRQ %d%s%s\n", driver_name, irq,
                 dev->has_cfr ? "" : " (!cfr)",
@@ -2250,10 +2255,8 @@ lubbock_fail0:
         if (dev->mach->gpio_vbus)
                 gpio_free(dev->mach->gpio_vbus);
  err_gpio_vbus:
-#ifdef  CONFIG_ARCH_PXA
         clk_put(dev->clk);
  err_clk:
-#endif
         return retval;
 }
 
@@ -2269,7 +2272,9 @@ static int __exit pxa2xx_udc_remove(struct platform_device *pdev)
         if (dev->driver)
                 return -EBUSY;
 
-        udc_disable(dev);
+        dev->pullup = 0;
+        pullup(dev);
+
         remove_debug_files(dev);
 
         if (dev->got_irq) {
@@ -2289,9 +2294,7 @@ static int __exit pxa2xx_udc_remove(struct platform_device *pdev)
         if (dev->mach->gpio_pullup)
                 gpio_free(dev->mach->gpio_pullup);
 
-#ifdef  CONFIG_ARCH_PXA
         clk_put(dev->clk);
-#endif
 
         platform_set_drvdata(pdev, NULL);
         the_controller = NULL;
@@ -2317,10 +2320,15 @@ static int __exit pxa2xx_udc_remove(struct platform_device *pdev)
 static int pxa2xx_udc_suspend(struct platform_device *dev, pm_message_t state)
 {
         struct pxa2xx_udc       *udc = platform_get_drvdata(dev);
+        unsigned long flags;
 
         if (!udc->mach->gpio_pullup && !udc->mach->udc_command)
                 WARN("USB host won't detect disconnect!\n");
-        pullup(udc, 0);
+        udc->suspended = 1;
+
+        local_irq_save(flags);
+        pullup(udc);
+        local_irq_restore(flags);
 
         return 0;
 }
@@ -2328,8 +2336,12 @@ static int pxa2xx_udc_suspend(struct platform_device *dev, pm_message_t state)
 static int pxa2xx_udc_resume(struct platform_device *dev)
 {
         struct pxa2xx_udc       *udc = platform_get_drvdata(dev);
+        unsigned long flags;
 
-        pullup(udc, 1);
+        udc->suspended = 0;
+        local_irq_save(flags);
+        pullup(udc);
+        local_irq_restore(flags);
 
         return 0;
 }
@@ -2368,4 +2380,4 @@ module_exit(udc_exit);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_AUTHOR("Frank Becker, Robert Schwebel, David Brownell");
 MODULE_LICENSE("GPL");
-
+MODULE_ALIAS("platform:pxa2xx-udc");
diff --git a/drivers/usb/gadget/pxa2xx_udc.h b/drivers/usb/gadget/pxa2xx_udc.h
index b67e3ff5e4eb..e2c19e88c875 100644
--- a/drivers/usb/gadget/pxa2xx_udc.h
+++ b/drivers/usb/gadget/pxa2xx_udc.h
@@ -119,7 +119,9 @@ struct pxa2xx_udc {
                                                 has_cfr : 1,
                                                 req_pending : 1,
                                                 req_std : 1,
-                                                req_config : 1;
+                                                req_config : 1,
+                                                suspended : 1,
+                                                active : 1;
 
 #define start_watchdog(dev) mod_timer(&dev->timer, jiffies + (HZ/200))
         struct timer_list                       timer;
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
index aadc4204d6f9..6b1ef488043b 100644
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -2047,3 +2047,5 @@ MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_VERSION(DRIVER_VERSION);
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:s3c2410-usbgadget");
+MODULE_ALIAS("platform:s3c2440-usbgadget");