8 files changed, 33 insertions, 19 deletions

diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index b005010240e5..14e1628483d9 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -63,11 +63,13 @@ comment "Platform Glue Layer"
 config USB_MUSB_DAVINCI
         tristate "DaVinci"
         depends on ARCH_DAVINCI_DMx
+        depends on NOP_USB_XCEIV
         depends on BROKEN
 
 config USB_MUSB_DA8XX
         tristate "DA8xx/OMAP-L1x"
         depends on ARCH_DAVINCI_DA8XX
+        depends on NOP_USB_XCEIV
         depends on BROKEN
 
 config USB_MUSB_TUSB6010
@@ -77,12 +79,13 @@ config USB_MUSB_TUSB6010
 
 config USB_MUSB_OMAP2PLUS
         tristate "OMAP2430 and onwards"
-        depends on ARCH_OMAP2PLUS && USB
+        depends on ARCH_OMAP2PLUS && USB && OMAP_CONTROL_PHY
         select GENERIC_PHY
 
 config USB_MUSB_AM35X
         tristate "AM35x"
         depends on ARCH_OMAP
+        depends on NOP_USB_XCEIV
 
 config USB_MUSB_DSPS
         tristate "TI DSPS platforms"
@@ -93,6 +96,7 @@ config USB_MUSB_DSPS
 config USB_MUSB_BLACKFIN
         tristate "Blackfin"
         depends on (BF54x && !BF544) || (BF52x && ! BF522 && !BF523)
+        depends on NOP_USB_XCEIV
 
 config USB_MUSB_UX500
         tristate "Ux500 platforms"
@@ -100,6 +104,7 @@ config USB_MUSB_UX500
 
 config USB_MUSB_JZ4740
         tristate "JZ4740"
+        depends on NOP_USB_XCEIV
         depends on MACH_JZ4740 || COMPILE_TEST
         depends on USB_MUSB_GADGET
         depends on USB_OTG_BLACKLIST_HUB
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
index 178250145613..6123b748d262 100644
--- a/drivers/usb/musb/blackfin.c
+++ b/drivers/usb/musb/blackfin.c
@@ -608,7 +608,7 @@ static SIMPLE_DEV_PM_OPS(bfin_pm_ops, bfin_suspend, bfin_resume);
 
 static struct platform_driver bfin_driver = {
         .probe          = bfin_probe,
-        .remove         = __exit_p(bfin_remove),
+        .remove         = bfin_remove,
         .driver         = {
                 .name   = "musb-blackfin",
                 .pm     = &bfin_pm_ops,
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 34cce3e38c49..e6f4cbfeed97 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -567,6 +567,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
 
                                 musb->xceiv->otg->state = OTG_STATE_A_HOST;
                                 musb->is_active = 1;
+                                musb_host_resume_root_hub(musb);
                                 break;
                         case OTG_STATE_B_WAIT_ACON:
                                 musb->xceiv->otg->state = OTG_STATE_B_PERIPHERAL;
@@ -2500,6 +2501,12 @@ static int musb_runtime_resume(struct device *dev)
                 musb_restore_context(musb);
         first = 0;
 
+        if (musb->need_finish_resume) {
+                musb->need_finish_resume = 0;
+                schedule_delayed_work(&musb->finish_resume_work,
+                                msecs_to_jiffies(20));
+        }
+
         return 0;
 }
 
diff --git a/drivers/usb/musb/musb_cppi41.c b/drivers/usb/musb/musb_cppi41.c
index c39a16ad7832..be84562d021b 100644
--- a/drivers/usb/musb/musb_cppi41.c
+++ b/drivers/usb/musb/musb_cppi41.c
@@ -9,9 +9,9 @@
 
 #define RNDIS_REG(x) (0x80 + ((x - 1) * 4))
 
-#define EP_MODE_AUTOREG_NONE            0
-#define EP_MODE_AUTOREG_ALL_NEOP        1
-#define EP_MODE_AUTOREG_ALWAYS          3
+#define EP_MODE_AUTOREQ_NONE            0
+#define EP_MODE_AUTOREQ_ALL_NEOP        1
+#define EP_MODE_AUTOREQ_ALWAYS          3
 
 #define EP_MODE_DMA_TRANSPARENT         0
 #define EP_MODE_DMA_RNDIS               1
@@ -404,19 +404,19 @@ static bool cppi41_configure_channel(struct dma_channel *channel,
 
                         /* auto req */
                         cppi41_set_autoreq_mode(cppi41_channel,
-                                        EP_MODE_AUTOREG_ALL_NEOP);
+                                        EP_MODE_AUTOREQ_ALL_NEOP);
                 } else {
                         musb_writel(musb->ctrl_base,
                                         RNDIS_REG(cppi41_channel->port_num), 0);
                         cppi41_set_dma_mode(cppi41_channel,
                                         EP_MODE_DMA_TRANSPARENT);
                         cppi41_set_autoreq_mode(cppi41_channel,
-                                        EP_MODE_AUTOREG_NONE);
+                                        EP_MODE_AUTOREQ_NONE);
                 }
         } else {
                 /* fallback mode */
                 cppi41_set_dma_mode(cppi41_channel, EP_MODE_DMA_TRANSPARENT);
-                cppi41_set_autoreq_mode(cppi41_channel, EP_MODE_AUTOREG_NONE);
+                cppi41_set_autoreq_mode(cppi41_channel, EP_MODE_AUTOREQ_NONE);
                 len = min_t(u32, packet_sz, len);
         }
         cppi41_channel->prog_len = len;
@@ -549,10 +549,15 @@ static int cppi41_dma_channel_abort(struct dma_channel *channel)
                 csr &= ~MUSB_TXCSR_DMAENAB;
                 musb_writew(epio, MUSB_TXCSR, csr);
         } else {
+                cppi41_set_autoreq_mode(cppi41_channel, EP_MODE_AUTOREQ_NONE);
+
                 csr = musb_readw(epio, MUSB_RXCSR);
                 csr &= ~(MUSB_RXCSR_H_REQPKT | MUSB_RXCSR_DMAENAB);
                 musb_writew(epio, MUSB_RXCSR, csr);
 
+                /* wait to drain cppi dma pipe line */
+                udelay(50);
+
                 csr = musb_readw(epio, MUSB_RXCSR);
                 if (csr & MUSB_RXCSR_RXPKTRDY) {
                         csr |= MUSB_RXCSR_FLUSHFIFO;
@@ -566,13 +571,14 @@ static int cppi41_dma_channel_abort(struct dma_channel *channel)
                 tdbit <<= 16;
 
         do {
-                musb_writel(musb->ctrl_base, USB_TDOWN, tdbit);
+                if (is_tx)
+                        musb_writel(musb->ctrl_base, USB_TDOWN, tdbit);
                 ret = dmaengine_terminate_all(cppi41_channel->dc);
         } while (ret == -EAGAIN);
 
-        musb_writel(musb->ctrl_base, USB_TDOWN, tdbit);
-
         if (is_tx) {
+                musb_writel(musb->ctrl_base, USB_TDOWN, tdbit);
+
                 csr = musb_readw(epio, MUSB_TXCSR);
                 if (csr & MUSB_TXCSR_TXPKTRDY) {
                         csr |= MUSB_TXCSR_FLUSHFIFO;
diff --git a/drivers/usb/musb/musb_debugfs.c b/drivers/usb/musb/musb_debugfs.c
index 48131aa8472c..78a283e9ce40 100644
--- a/drivers/usb/musb/musb_debugfs.c
+++ b/drivers/usb/musb/musb_debugfs.c
@@ -196,7 +196,7 @@ static ssize_t musb_test_mode_write(struct file *file,
 
         memset(buf, 0x00, sizeof(buf));
 
-        if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
+        if (copy_from_user(buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
                 return -EFAULT;
 
         if (strstarts(buf, "force host"))
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 49b04cb6f5ca..b2d9040c7685 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1612,9 +1612,7 @@ done:
 static int
 musb_gadget_set_self_powered(struct usb_gadget *gadget, int is_selfpowered)
 {
-        struct musb     *musb = gadget_to_musb(gadget);
-
-        musb->is_self_powered = !!is_selfpowered;
+        gadget->is_selfpowered = !!is_selfpowered;
         return 0;
 }
 
diff --git a/drivers/usb/musb/musb_gadget_ep0.c b/drivers/usb/musb/musb_gadget_ep0.c
index 2af45a0c8930..10d30afe4a3c 100644
--- a/drivers/usb/musb/musb_gadget_ep0.c
+++ b/drivers/usb/musb/musb_gadget_ep0.c
@@ -85,7 +85,7 @@ static int service_tx_status_request(
 
         switch (recip) {
         case USB_RECIP_DEVICE:
-                result[0] = musb->is_self_powered << USB_DEVICE_SELF_POWERED;
+                result[0] = musb->g.is_selfpowered << USB_DEVICE_SELF_POWERED;
                 result[0] |= musb->may_wakeup << USB_DEVICE_REMOTE_WAKEUP;
                 if (musb->g.is_otg) {
                         result[0] |= musb->g.b_hnp_enable
diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c
index b79e5be7aa97..294e159f4afe 100644
--- a/drivers/usb/musb/musb_virthub.c
+++ b/drivers/usb/musb/musb_virthub.c
@@ -72,7 +72,6 @@ void musb_host_finish_resume(struct work_struct *work)
         musb->xceiv->otg->state = OTG_STATE_A_HOST;
 
         spin_unlock_irqrestore(&musb->lock, flags);
-        musb_host_resume_root_hub(musb);
 }
 
 void musb_port_suspend(struct musb *musb, bool do_suspend)
@@ -349,8 +348,7 @@ int musb_hub_control(
                 desc->bDescriptorType = 0x29;
                 desc->bNbrPorts = 1;
                 desc->wHubCharacteristics = cpu_to_le16(
-                          HUB_CHAR_INDV_PORT_LPSM /* per-port power switching */
-
+                        HUB_CHAR_INDV_PORT_LPSM /* per-port power switching */
                         | HUB_CHAR_NO_OCPM      /* no overcurrent reporting */
                         );
                 desc->bPwrOn2PwrGood = 5;       /* msec/2 */