USB: gadget: imx_udc: Use resource size

[mv-sheeva.git] / drivers / usb / gadget / r8a66597-udc.c

diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c
index c65753ffe0f0aa5ab405a692a33fd669fb0d06e6..e220fb8091a3618d536123f86c724d95bc7e8325 100644 (file)
--- a/drivers/usb/gadget/r8a66597-udc.c
+++ b/drivers/usb/gadget/r8a66597-udc.c
@@ -252,24 +252,27 @@ static int pipe_buffer_setting(struct r8a66597 *r8a66597,
                buf_bsize = 0;
                break;
        case R8A66597_BULK:
-               bufnum = r8a66597->bi_bufnum +
-                        (info->pipe - R8A66597_BASE_PIPENUM_BULK) * 16;
-               r8a66597->bi_bufnum += 16;
+               /* isochronous pipes may be used as bulk pipes */
+               if (info->pipe > R8A66597_BASE_PIPENUM_BULK)
+                       bufnum = info->pipe - R8A66597_BASE_PIPENUM_BULK;
+               else
+                       bufnum = info->pipe - R8A66597_BASE_PIPENUM_ISOC;
+
+               bufnum = R8A66597_BASE_BUFNUM + (bufnum * 16);
                buf_bsize = 7;
                pipecfg |= R8A66597_DBLB;
                if (!info->dir_in)
                        pipecfg |= R8A66597_SHTNAK;
                break;
        case R8A66597_ISO:
-               bufnum = r8a66597->bi_bufnum +
+               bufnum = R8A66597_BASE_BUFNUM +
                         (info->pipe - R8A66597_BASE_PIPENUM_ISOC) * 16;
-               r8a66597->bi_bufnum += 16;
                buf_bsize = 7;
                break;
        }
-       if (r8a66597->bi_bufnum > R8A66597_MAX_BUFNUM) {
-               printk(KERN_ERR "r8a66597 pipe memory is insufficient(%d)\n",
-                               r8a66597->bi_bufnum);
+
+       if (buf_bsize && ((bufnum + 16) >= R8A66597_MAX_BUFNUM)) {
+               pr_err(KERN_ERR "r8a66597 pipe memory is insufficient\n");
                return -ENOMEM;
        }
 
@@ -289,17 +292,6 @@ static void pipe_buffer_release(struct r8a66597 *r8a66597,
        if (info->pipe == 0)
                return;
 
-       switch (info->type) {
-       case R8A66597_BULK:
-               if (is_bulk_pipe(info->pipe))
-                       r8a66597->bi_bufnum -= 16;
-               break;
-       case R8A66597_ISO:
-               if (is_isoc_pipe(info->pipe))
-                       r8a66597->bi_bufnum -= 16;
-               break;
-       }
-
        if (is_bulk_pipe(info->pipe))
                r8a66597->bulk--;
        else if (is_interrupt_pipe(info->pipe))
@@ -622,8 +614,17 @@ static void disable_controller(struct r8a66597 *r8a66597)
        if (r8a66597->pdata->on_chip) {
                r8a66597_bset(r8a66597, SCKE, SYSCFG0);
 
+               /* disable interrupts */
                r8a66597_write(r8a66597, 0, INTENB0);
                r8a66597_write(r8a66597, 0, INTENB1);
+               r8a66597_write(r8a66597, 0, BRDYENB);
+               r8a66597_write(r8a66597, 0, BEMPENB);
+               r8a66597_write(r8a66597, 0, NRDYENB);
+
+               /* clear status */
+               r8a66597_write(r8a66597, 0, BRDYSTS);
+               r8a66597_write(r8a66597, 0, NRDYSTS);
+               r8a66597_write(r8a66597, 0, BEMPSTS);
 
                r8a66597_bclr(r8a66597, USBE, SYSCFG0);
                r8a66597_bclr(r8a66597, SCKE, SYSCFG0);
@@ -965,8 +966,13 @@ static void clear_feature(struct r8a66597 *r8a66597,
                u16 w_index = le16_to_cpu(ctrl->wIndex);
 
                ep = r8a66597->epaddr2ep[w_index & USB_ENDPOINT_NUMBER_MASK];
-               pipe_stop(r8a66597, ep->pipenum);
-               control_reg_sqclr(r8a66597, ep->pipenum);
+               if (!ep->wedge) {
+                       pipe_stop(r8a66597, ep->pipenum);
+                       control_reg_sqclr(r8a66597, ep->pipenum);
+                       spin_unlock(&r8a66597->lock);
+                       usb_ep_clear_halt(&ep->ep);
+                       spin_lock(&r8a66597->lock);
+               }
 
                control_end(r8a66597, 1);
 
@@ -1339,6 +1345,7 @@ static int r8a66597_set_halt(struct usb_ep *_ep, int value)
                pipe_stall(ep->r8a66597, ep->pipenum);
        } else {
                ep->busy = 0;
+               ep->wedge = 0;
                pipe_stop(ep->r8a66597, ep->pipenum);
        }
 
@@ -1347,6 +1354,23 @@ out:
        return ret;
 }
 
+static int r8a66597_set_wedge(struct usb_ep *_ep)
+{
+       struct r8a66597_ep *ep;
+       unsigned long flags;
+
+       ep = container_of(_ep, struct r8a66597_ep, ep);
+
+       if (!ep || !ep->desc)
+               return -EINVAL;
+
+       spin_lock_irqsave(&ep->r8a66597->lock, flags);
+       ep->wedge = 1;
+       spin_unlock_irqrestore(&ep->r8a66597->lock, flags);
+
+       return usb_ep_set_halt(_ep);
+}
+
 static void r8a66597_fifo_flush(struct usb_ep *_ep)
 {
        struct r8a66597_ep *ep;
@@ -1372,6 +1396,7 @@ static struct usb_ep_ops r8a66597_ep_ops = {
        .dequeue        = r8a66597_dequeue,
 
        .set_halt       = r8a66597_set_halt,
+       .set_wedge      = r8a66597_set_wedge,
        .fifo_flush     = r8a66597_fifo_flush,
 };
 
@@ -1553,8 +1578,6 @@ static int __init r8a66597_probe(struct platform_device *pdev)
        r8a66597->timer.data = (unsigned long)r8a66597;
        r8a66597->reg = (unsigned long)reg;
 
-       r8a66597->bi_bufnum = R8A66597_BASE_BUFNUM;
-
 #ifdef CONFIG_HAVE_CLK
        if (r8a66597->pdata->on_chip) {
                snprintf(clk_name, sizeof(clk_name), "usb%d", pdev->id);