diff options
| author | Tom Rini <trini@konsulko.com> | 2023-10-13 16:14:34 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-10-13 16:14:34 -0400 |
| commit | ab9fbac81670478feccd439a5d84a67bd14d581d (patch) | |
| tree | 0f04b239b1a12a3aec1804b26b07d1b1dce96f03 /drivers | |
| parent | d5d24e2e0a3f54175e458d89acd626da939e1130 (diff) | |
| parent | bc8e94c902d8b5a24d6b31963fc26058b54986ef (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-usb
- atmel gadget controller fix
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/gadget/atmel_usba_udc.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index f16731c8eb..4c420747b0 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c @@ -58,13 +58,9 @@ static void submit_request(struct usba_ep *ep, struct usba_request *req) req->submitted = 1; next_fifo_transaction(ep, req); - if (req->last_transaction) { - usba_ep_writel(ep, CTL_DIS, USBA_TX_PK_RDY); - usba_ep_writel(ep, CTL_ENB, USBA_TX_COMPLETE); - } else { + if (ep_is_control(ep)) usba_ep_writel(ep, CTL_DIS, USBA_TX_COMPLETE); - usba_ep_writel(ep, CTL_ENB, USBA_TX_PK_RDY); - } + usba_ep_writel(ep, CTL_ENB, USBA_TX_PK_RDY); } static void submit_next_request(struct usba_ep *ep) @@ -890,7 +886,6 @@ restart: if (req) { list_del_init(&req->queue); request_complete(ep, req, 0); - submit_next_request(ep); } usba_ep_writel(ep, CTL_DIS, USBA_TX_COMPLETE); ep->state = WAIT_FOR_SETUP; @@ -1037,7 +1032,6 @@ static void usba_ep_irq(struct usba_udc *udc, struct usba_ep *ep) DBG(DBG_BUS, "%s: TX PK ready\n", ep->ep.name); if (list_empty(&ep->queue)) { - DBG(DBG_INT, "ep_irq: queue empty\n"); usba_ep_writel(ep, CTL_DIS, USBA_TX_PK_RDY); return; } @@ -1051,7 +1045,6 @@ static void usba_ep_irq(struct usba_udc *udc, struct usba_ep *ep) if (req->last_transaction) { list_del_init(&req->queue); - submit_next_request(ep); request_complete(ep, req, 0); } |