usb: gadget: fusb300_udc: add FUSB300_EPSET0_STL_CLR for clearing EP0 stall

The final version of fusb300 controller adds EPSET0_STL_CLR
for clearing EP0 stall and also removes EPSET0_EPn_TX0BYTE.

fusb300_udc driver is tested on FARADAY platform a369 with
FUSB300 FPGA v1.8

Signed-off-by: Yuan-Hsin Chen <yhchen@faraday-tech.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/gadget/fusb300_udc.c b/drivers/usb/gadget/fusb300_udc.c
index d05355389dd6b5b91e10d9eeaa289a92de6d9c78..db0d2917987aa75eed450cbe171586f2365992e7 100644 (file)
--- a/drivers/usb/gadget/fusb300_udc.c
+++ b/drivers/usb/gadget/fusb300_udc.c
@@ -394,7 +394,7 @@ static void fusb300_clear_epnstall(struct fusb300 *fusb300, u8 ep)
 
        if (reg & FUSB300_EPSET0_STL) {
                printk(KERN_DEBUG "EP%d stall... Clear!!\n", ep);
-               reg &= ~FUSB300_EPSET0_STL;
+               reg |= FUSB300_EPSET0_STL_CLR;
                iowrite32(reg, fusb300->reg + FUSB300_OFFSET_EPSET0(ep));
        }
 }

diff --git a/drivers/usb/gadget/fusb300_udc.h b/drivers/usb/gadget/fusb300_udc.h
index 6ba444ae8dd546e22b637fc150cd6b7abe88df52..ae811d8d38b435d9cd198369b399b1cf58bda63c 100644 (file)
--- a/drivers/usb/gadget/fusb300_udc.h
+++ b/drivers/usb/gadget/fusb300_udc.h
@@ -111,8 +111,8 @@
 /*
  * * EPn Setting 0 (EPn_SET0, offset = 020H+(n-1)*30H, n=1~15 )
  * */
+#define FUSB300_EPSET0_STL_CLR         (1 << 3)
 #define FUSB300_EPSET0_CLRSEQNUM       (1 << 2)
-#define FUSB300_EPSET0_EPn_TX0BYTE     (1 << 1)
 #define FUSB300_EPSET0_STL             (1 << 0)
 
 /*