diff options
author | Yuan-Hsin Chen <yuanlmm@gmail.com> | 2013-04-02 07:15:28 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2013-04-02 09:57:24 -0400 |
commit | 9770a16fd9d9c5a91378d53732be1d2ec599bfcf (patch) | |
tree | 74964d0d6ef538b8f754570e8a49a52e8dd4f27b | |
parent | 19fda7cd59eac8e537f63a4d9bd5973bf78a8c38 (diff) |
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>
-rw-r--r-- | drivers/usb/gadget/fusb300_udc.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/fusb300_udc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/fusb300_udc.c b/drivers/usb/gadget/fusb300_udc.c index d05355389dd6..db0d2917987a 100644 --- 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) | |||
394 | 394 | ||
395 | if (reg & FUSB300_EPSET0_STL) { | 395 | if (reg & FUSB300_EPSET0_STL) { |
396 | printk(KERN_DEBUG "EP%d stall... Clear!!\n", ep); | 396 | printk(KERN_DEBUG "EP%d stall... Clear!!\n", ep); |
397 | reg &= ~FUSB300_EPSET0_STL; | 397 | reg |= FUSB300_EPSET0_STL_CLR; |
398 | iowrite32(reg, fusb300->reg + FUSB300_OFFSET_EPSET0(ep)); | 398 | iowrite32(reg, fusb300->reg + FUSB300_OFFSET_EPSET0(ep)); |
399 | } | 399 | } |
400 | } | 400 | } |
diff --git a/drivers/usb/gadget/fusb300_udc.h b/drivers/usb/gadget/fusb300_udc.h index 6ba444ae8dd5..ae811d8d38b4 100644 --- a/drivers/usb/gadget/fusb300_udc.h +++ b/drivers/usb/gadget/fusb300_udc.h | |||
@@ -111,8 +111,8 @@ | |||
111 | /* | 111 | /* |
112 | * * EPn Setting 0 (EPn_SET0, offset = 020H+(n-1)*30H, n=1~15 ) | 112 | * * EPn Setting 0 (EPn_SET0, offset = 020H+(n-1)*30H, n=1~15 ) |
113 | * */ | 113 | * */ |
114 | #define FUSB300_EPSET0_STL_CLR (1 << 3) | ||
114 | #define FUSB300_EPSET0_CLRSEQNUM (1 << 2) | 115 | #define FUSB300_EPSET0_CLRSEQNUM (1 << 2) |
115 | #define FUSB300_EPSET0_EPn_TX0BYTE (1 << 1) | ||
116 | #define FUSB300_EPSET0_STL (1 << 0) | 116 | #define FUSB300_EPSET0_STL (1 << 0) |
117 | 117 | ||
118 | /* | 118 | /* |