diff options
author | Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> | 2017-04-26 07:50:10 -0400 |
---|---|---|
committer | Felipe Balbi <felipe.balbi@linux.intel.com> | 2017-06-02 05:45:02 -0400 |
commit | afbbc7913a288c29616bd31ae612548f6475151a (patch) | |
tree | 9ac90f90ff826bfa1a231f26492956f196a55ea3 | |
parent | 940f538a100c84c6e72813e4ac88bd1753a86945 (diff) |
usb: gadget: udc: renesas_usb3: Fix PN_INT_ENA disabling timing
The PN_INT_ENA register should be used after usb3_pn_change() is called.
So, this patch moves the access from renesas_usb3_stop_controller() to
usb3_disable_pipe_n().
Fixes: 746bfe63bba3 ("usb: gadget: renesas_usb3: add support for Renesas USB3.0 peripheral controller")
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
-rw-r--r-- | drivers/usb/gadget/udc/renesas_usb3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c index c05097b5661e..cd4c88529721 100644 --- a/drivers/usb/gadget/udc/renesas_usb3.c +++ b/drivers/usb/gadget/udc/renesas_usb3.c | |||
@@ -623,7 +623,6 @@ static void renesas_usb3_stop_controller(struct renesas_usb3 *usb3) | |||
623 | { | 623 | { |
624 | usb3_disconnect(usb3); | 624 | usb3_disconnect(usb3); |
625 | usb3_write(usb3, 0, USB3_P0_INT_ENA); | 625 | usb3_write(usb3, 0, USB3_P0_INT_ENA); |
626 | usb3_write(usb3, 0, USB3_PN_INT_ENA); | ||
627 | usb3_write(usb3, 0, USB3_USB_OTG_INT_ENA); | 626 | usb3_write(usb3, 0, USB3_USB_OTG_INT_ENA); |
628 | usb3_write(usb3, 0, USB3_USB_INT_ENA_1); | 627 | usb3_write(usb3, 0, USB3_USB_INT_ENA_1); |
629 | usb3_write(usb3, 0, USB3_USB_INT_ENA_2); | 628 | usb3_write(usb3, 0, USB3_USB_INT_ENA_2); |
@@ -1682,6 +1681,7 @@ static int usb3_disable_pipe_n(struct renesas_usb3_ep *usb3_ep) | |||
1682 | 1681 | ||
1683 | spin_lock_irqsave(&usb3->lock, flags); | 1682 | spin_lock_irqsave(&usb3->lock, flags); |
1684 | if (!usb3_pn_change(usb3, usb3_ep->num)) { | 1683 | if (!usb3_pn_change(usb3, usb3_ep->num)) { |
1684 | usb3_write(usb3, 0, USB3_PN_INT_ENA); | ||
1685 | usb3_write(usb3, 0, USB3_PN_RAMMAP); | 1685 | usb3_write(usb3, 0, USB3_PN_RAMMAP); |
1686 | usb3_clear_bit(usb3, PN_CON_EN, USB3_PN_CON); | 1686 | usb3_clear_bit(usb3, PN_CON_EN, USB3_PN_CON); |
1687 | } | 1687 | } |