aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/chipidea/udc.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-28 02:47:56 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-28 02:47:56 -0500
commit9dd649c6390dcf3c7b4e66703a88a1c5492562cf (patch)
treee1d904d118d3b948c56c129b5c2e6ad614d38e43 /drivers/usb/chipidea/udc.c
parent75e9ebecfedb88a22eee0d2b3b63aeaeab1bfdee (diff)
parent3be3251db0887f721f9c110e1966900922fc4ff4 (diff)
Merge tag 'usb-ci-v4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next
Peter writes: - Adding ULPI PHY support for imx53 - Properly mark little endian descriptors for udc
Diffstat (limited to 'drivers/usb/chipidea/udc.c')
-rw-r--r--drivers/usb/chipidea/udc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index f5320d66019a..cf132f057137 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -365,7 +365,7 @@ static int add_td_to_list(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq,
365 if (hwreq->req.length == 0 365 if (hwreq->req.length == 0
366 || hwreq->req.length % hwep->ep.maxpacket) 366 || hwreq->req.length % hwep->ep.maxpacket)
367 mul++; 367 mul++;
368 node->ptr->token |= mul << __ffs(TD_MULTO); 368 node->ptr->token |= cpu_to_le32(mul << __ffs(TD_MULTO));
369 } 369 }
370 370
371 temp = (u32) (hwreq->req.dma + hwreq->req.actual); 371 temp = (u32) (hwreq->req.dma + hwreq->req.actual);
@@ -504,7 +504,7 @@ static int _hardware_enqueue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq)
504 if (hwreq->req.length == 0 504 if (hwreq->req.length == 0
505 || hwreq->req.length % hwep->ep.maxpacket) 505 || hwreq->req.length % hwep->ep.maxpacket)
506 mul++; 506 mul++;
507 hwep->qh.ptr->cap |= mul << __ffs(QH_MULT); 507 hwep->qh.ptr->cap |= cpu_to_le32(mul << __ffs(QH_MULT));
508 } 508 }
509 509
510 ret = hw_ep_prime(ci, hwep->num, hwep->dir, 510 ret = hw_ep_prime(ci, hwep->num, hwep->dir,
@@ -529,7 +529,7 @@ static void free_pending_td(struct ci_hw_ep *hwep)
529static int reprime_dtd(struct ci_hdrc *ci, struct ci_hw_ep *hwep, 529static int reprime_dtd(struct ci_hdrc *ci, struct ci_hw_ep *hwep,
530 struct td_node *node) 530 struct td_node *node)
531{ 531{
532 hwep->qh.ptr->td.next = node->dma; 532 hwep->qh.ptr->td.next = cpu_to_le32(node->dma);
533 hwep->qh.ptr->td.token &= 533 hwep->qh.ptr->td.token &=
534 cpu_to_le32(~(TD_STATUS_HALTED | TD_STATUS_ACTIVE)); 534 cpu_to_le32(~(TD_STATUS_HALTED | TD_STATUS_ACTIVE));
535 535