1 files changed, 10 insertions, 3 deletions

diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 6582a20bec05..ed455724017b 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -39,7 +39,6 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
-#include <linux/init.h>
 #include <linux/list.h>
 #include <linux/dma-mapping.h>
 
@@ -2013,7 +2012,7 @@ static int musb_schedule(
                         head = &musb->out_bulk;
 
                 /* Enable bulk RX/TX NAK timeout scheme when bulk requests are
-                 * multiplexed.  This scheme doen't work in high speed to full
+                 * multiplexed. This scheme does not work in high speed to full
                  * speed scenario as NAK interrupts are not coming from a
                  * full speed device connected to a high speed device.
                  * NAK timeout interval is 8 (128 uframe or 16ms) for HS and
@@ -2433,6 +2432,8 @@ static int musb_bus_suspend(struct usb_hcd *hcd)
         struct musb     *musb = hcd_to_musb(hcd);
         u8              devctl;
 
+        musb_port_suspend(musb, true);
+
         if (!is_host_active(musb))
                 return 0;
 
@@ -2462,7 +2463,12 @@ static int musb_bus_suspend(struct usb_hcd *hcd)
 
 static int musb_bus_resume(struct usb_hcd *hcd)
 {
-        /* resuming child port does the work */
+        struct musb *musb = hcd_to_musb(hcd);
+
+        if (musb->config &&
+            musb->config->host_port_deassert_reset_at_resume)
+                musb_port_reset(musb, false);
+
         return 0;
 }
 
@@ -2657,6 +2663,7 @@ int musb_host_setup(struct musb *musb, int power_budget)
         if (ret < 0)
                 return ret;
 
+        device_wakeup_enable(hcd->self.controller);
         return 0;
 }