diff options
author | Tomoya MORINAGA <tomoya.rohm@gmail.com> | 2012-01-11 21:27:09 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-22 19:21:43 -0400 |
commit | d5e285ee81a3daa1c46f30a61de5832cfb0c8f6c (patch) | |
tree | 9969278504f96ab9cca7eb13cd5a6999e97e9c4b /drivers/usb/gadget | |
parent | c1fb81ad2e7692b01588c34e02368b284f60960c (diff) |
usb: gadget: pch_udc: Reduce redundant interrupt
commit 833310402c54ad9b676b465fc53ad276b13d36be upstream.
ISSUE:
USB Suspend interrupts occur frequently.
CAUSE:
When it is called pch_udc_reconnect() in USB Suspend, it repeats reset and
Suspend.
SOLUTION:
pch_udc_reconnect() does not enable all interrupts. When an enumeration event
occurred the driver enables all interrupts.
Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r-- | drivers/usb/gadget/pch_udc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/usb/gadget/pch_udc.c b/drivers/usb/gadget/pch_udc.c index 654d79d5bf1..2231122aab2 100644 --- a/drivers/usb/gadget/pch_udc.c +++ b/drivers/usb/gadget/pch_udc.c | |||
@@ -576,9 +576,7 @@ static void pch_udc_reconnect(struct pch_udc_dev *dev) | |||
576 | /* enable device interrupts */ | 576 | /* enable device interrupts */ |
577 | /* pch_udc_enable_interrupts() */ | 577 | /* pch_udc_enable_interrupts() */ |
578 | pch_udc_bit_clr(dev, UDC_DEVIRQMSK_ADDR, | 578 | pch_udc_bit_clr(dev, UDC_DEVIRQMSK_ADDR, |
579 | UDC_DEVINT_UR | UDC_DEVINT_US | | 579 | UDC_DEVINT_UR | UDC_DEVINT_ENUM); |
580 | UDC_DEVINT_ENUM | | ||
581 | UDC_DEVINT_SI | UDC_DEVINT_SC); | ||
582 | 580 | ||
583 | /* Clear the disconnect */ | 581 | /* Clear the disconnect */ |
584 | pch_udc_bit_set(dev, UDC_DEVCTL_ADDR, UDC_DEVCTL_RES); | 582 | pch_udc_bit_set(dev, UDC_DEVCTL_ADDR, UDC_DEVCTL_RES); |
@@ -2422,6 +2420,11 @@ static void pch_udc_svc_enum_interrupt(struct pch_udc_dev *dev) | |||
2422 | pch_udc_set_dma(dev, DMA_DIR_TX); | 2420 | pch_udc_set_dma(dev, DMA_DIR_TX); |
2423 | pch_udc_set_dma(dev, DMA_DIR_RX); | 2421 | pch_udc_set_dma(dev, DMA_DIR_RX); |
2424 | pch_udc_ep_set_rrdy(&(dev->ep[UDC_EP0OUT_IDX])); | 2422 | pch_udc_ep_set_rrdy(&(dev->ep[UDC_EP0OUT_IDX])); |
2423 | |||
2424 | /* enable device interrupts */ | ||
2425 | pch_udc_enable_interrupts(dev, UDC_DEVINT_UR | UDC_DEVINT_US | | ||
2426 | UDC_DEVINT_ES | UDC_DEVINT_ENUM | | ||
2427 | UDC_DEVINT_SI | UDC_DEVINT_SC); | ||
2425 | } | 2428 | } |
2426 | 2429 | ||
2427 | /** | 2430 | /** |