1 files changed, 12 insertions, 4 deletions

diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 32fb057c03f5..d4aa779339f1 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1727,14 +1727,14 @@ init_peripheral_ep(struct musb *musb, struct musb_ep *ep, u8 epnum, int is_in)
         ep->end_point.name = ep->name;
         INIT_LIST_HEAD(&ep->end_point.ep_list);
         if (!epnum) {
-                ep->end_point.maxpacket = 64;
+                usb_ep_set_maxpacket_limit(&ep->end_point, 64);
                 ep->end_point.ops = &musb_g_ep0_ops;
                 musb->g.ep0 = &ep->end_point;
         } else {
                 if (is_in)
-                        ep->end_point.maxpacket = hw_ep->max_packet_sz_tx;
+                        usb_ep_set_maxpacket_limit(&ep->end_point, hw_ep->max_packet_sz_tx);
                 else
-                        ep->end_point.maxpacket = hw_ep->max_packet_sz_rx;
+                        usb_ep_set_maxpacket_limit(&ep->end_point, hw_ep->max_packet_sz_rx);
                 ep->end_point.ops = &musb_ep_ops;
                 list_add_tail(&ep->end_point.ep_list, &musb->g.ep_list);
         }
@@ -2119,7 +2119,15 @@ __acquires(musb->lock)
         /* Normal reset, as B-Device;
          * or else after HNP, as A-Device
          */
-        if (devctl & MUSB_DEVCTL_BDEVICE) {
+        if (!musb->g.is_otg) {
+                /* USB device controllers that are not OTG compatible
+                 * may not have DEVCTL register in silicon.
+                 * In that case, do not rely on devctl for setting
+                 * peripheral mode.
+                 */
+                musb->xceiv->state = OTG_STATE_B_PERIPHERAL;
+                musb->g.is_a_peripheral = 0;
+        } else if (devctl & MUSB_DEVCTL_BDEVICE) {
                 musb->xceiv->state = OTG_STATE_B_PERIPHERAL;
                 musb->g.is_a_peripheral = 0;
         } else {