diff options
Diffstat (limited to 'drivers/usb/gadget/udc/s3c2410_udc.c')
-rw-r--r-- | drivers/usb/gadget/udc/s3c2410_udc.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/drivers/usb/gadget/udc/s3c2410_udc.c b/drivers/usb/gadget/udc/s3c2410_udc.c index 824cf12e9add..b808951491cc 100644 --- a/drivers/usb/gadget/udc/s3c2410_udc.c +++ b/drivers/usb/gadget/udc/s3c2410_udc.c | |||
@@ -238,14 +238,6 @@ static inline void s3c2410_udc_set_ep0_de_out(void __iomem *base) | |||
238 | S3C2410_UDC_EP0_CSR_REG); | 238 | S3C2410_UDC_EP0_CSR_REG); |
239 | } | 239 | } |
240 | 240 | ||
241 | static inline void s3c2410_udc_set_ep0_sse_out(void __iomem *base) | ||
242 | { | ||
243 | udc_writeb(base, S3C2410_UDC_INDEX_EP0, S3C2410_UDC_INDEX_REG); | ||
244 | udc_writeb(base, (S3C2410_UDC_EP0_CSR_SOPKTRDY | ||
245 | | S3C2410_UDC_EP0_CSR_SSE), | ||
246 | S3C2410_UDC_EP0_CSR_REG); | ||
247 | } | ||
248 | |||
249 | static inline void s3c2410_udc_set_ep0_de_in(void __iomem *base) | 241 | static inline void s3c2410_udc_set_ep0_de_in(void __iomem *base) |
250 | { | 242 | { |
251 | udc_writeb(base, S3C2410_UDC_INDEX_EP0, S3C2410_UDC_INDEX_REG); | 243 | udc_writeb(base, S3C2410_UDC_INDEX_EP0, S3C2410_UDC_INDEX_REG); |
@@ -291,18 +283,6 @@ static void s3c2410_udc_nuke(struct s3c2410_udc *udc, | |||
291 | } | 283 | } |
292 | } | 284 | } |
293 | 285 | ||
294 | static inline void s3c2410_udc_clear_ep_state(struct s3c2410_udc *dev) | ||
295 | { | ||
296 | unsigned i; | ||
297 | |||
298 | /* hardware SET_{CONFIGURATION,INTERFACE} automagic resets endpoint | ||
299 | * fifos, and pending transactions mustn't be continued in any case. | ||
300 | */ | ||
301 | |||
302 | for (i = 1; i < S3C2410_ENDPOINTS; i++) | ||
303 | s3c2410_udc_nuke(dev, &dev->ep[i], -ECONNABORTED); | ||
304 | } | ||
305 | |||
306 | static inline int s3c2410_udc_fifo_count_out(void) | 286 | static inline int s3c2410_udc_fifo_count_out(void) |
307 | { | 287 | { |
308 | int tmp; | 288 | int tmp; |
@@ -1454,6 +1434,7 @@ static int s3c2410_udc_set_selfpowered(struct usb_gadget *gadget, int value) | |||
1454 | 1434 | ||
1455 | dprintk(DEBUG_NORMAL, "%s()\n", __func__); | 1435 | dprintk(DEBUG_NORMAL, "%s()\n", __func__); |
1456 | 1436 | ||
1437 | gadget->is_selfpowered = (value != 0); | ||
1457 | if (value) | 1438 | if (value) |
1458 | udc->devstatus |= (1 << USB_DEVICE_SELF_POWERED); | 1439 | udc->devstatus |= (1 << USB_DEVICE_SELF_POWERED); |
1459 | else | 1440 | else |