summaryrefslogtreecommitdiff
path: root/drivers/usb/chipidea
diff options
context:
space:
mode:
authorMichael Grzeschik <m.grzeschik@pengutronix.de>2013-03-30 12:54:05 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-30 08:20:48 -0700
commit1cd12a9cf055e72b3094ef38ac4d9afff2e9520e (patch)
tree46ac251c51aa1e0e2eb5e194abcfc6927c7dfe37 /drivers/usb/chipidea
parent080ff5f4719e21c78f8ec96eea4f82b2fd047fa4 (diff)
usb: chipidea: udc: rework ep_enable cap setting
This patch reworks the cap value from several read and write operations to one single operation. Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Reviewed-by: Felipe Balbi <balbi@ti.com> [Alex: removed useless isoc-related bit of code] Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/chipidea')
-rw-r--r--drivers/usb/chipidea/udc.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index 0e11172a4c84..3abd1ad5ced1 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -986,6 +986,7 @@ static int ep_enable(struct usb_ep *ep,
struct ci13xxx_ep *mEp = container_of(ep, struct ci13xxx_ep, ep);
int retval = 0;
unsigned long flags;
+ u32 cap = 0;
if (ep == NULL || desc == NULL)
return -EINVAL;
@@ -1005,17 +1006,12 @@ static int ep_enable(struct usb_ep *ep,
mEp->ep.maxpacket = usb_endpoint_maxp(desc);
- mEp->qh.ptr->cap = 0;
-
if (mEp->type == USB_ENDPOINT_XFER_CONTROL)
- mEp->qh.ptr->cap |= cpu_to_le32(QH_IOS);
- else if (mEp->type == USB_ENDPOINT_XFER_ISOC)
- mEp->qh.ptr->cap &= cpu_to_le32(~QH_MULT);
- else
- mEp->qh.ptr->cap &= cpu_to_le32(~QH_ZLT);
+ cap |= QH_IOS;
+ cap |= (mEp->ep.maxpacket << __ffs(QH_MAX_PKT)) & QH_MAX_PKT;
+
+ mEp->qh.ptr->cap = cpu_to_le32(cap);
- mEp->qh.ptr->cap |= cpu_to_le32((mEp->ep.maxpacket << __ffs(QH_MAX_PKT))
- & QH_MAX_PKT);
mEp->qh.ptr->td.next |= cpu_to_le32(TD_TERMINATE); /* needed? */
/*