| From b34ed6237b6d70437330da9dcd93fdbf6e5ab4a4 Mon Sep 17 00:00:00 2001 |
| From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
| Date: Wed, 26 Apr 2017 20:50:10 +0900 |
| Subject: [PATCH 138/286] 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> |
| (cherry picked from commit afbbc7913a288c29616bd31ae612548f6475151a) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/usb/gadget/udc/renesas_usb3.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/usb/gadget/udc/renesas_usb3.c |
| +++ b/drivers/usb/gadget/udc/renesas_usb3.c |
| @@ -630,7 +630,6 @@ static void renesas_usb3_stop_controller |
| { |
| usb3_disconnect(usb3); |
| usb3_write(usb3, 0, USB3_P0_INT_ENA); |
| - usb3_write(usb3, 0, USB3_PN_INT_ENA); |
| usb3_write(usb3, 0, USB3_USB_OTG_INT_ENA); |
| usb3_write(usb3, 0, USB3_USB_INT_ENA_1); |
| usb3_write(usb3, 0, USB3_USB_INT_ENA_2); |
| @@ -1711,6 +1710,7 @@ static int usb3_disable_pipe_n(struct re |
| |
| spin_lock_irqsave(&usb3->lock, flags); |
| if (!usb3_pn_change(usb3, usb3_ep->num)) { |
| + usb3_write(usb3, 0, USB3_PN_INT_ENA); |
| usb3_write(usb3, 0, USB3_PN_RAMMAP); |
| usb3_clear_bit(usb3, PN_CON_EN, USB3_PN_CON); |
| } |
