diff options
author | Bo Shen <voice.shen@atmel.com> | 2014-02-18 21:07:44 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2014-02-19 14:47:12 -0500 |
commit | 3fcba0d87bfb5f880d34868090e05571dca80f78 (patch) | |
tree | 79e4bb43640998bea8bc8c084e260ce864aefede /drivers/usb/gadget | |
parent | aa7be0f8f7fbd446c7cd5352480d0d10d78f742b (diff) |
usb: gadget: at91: using USBA_NR_DMAS for DMA channels
The SoCs earlier than sama5d3, they have the same number endpoints
and DMA channels. In driver code, they use the same definition
USBA_NR_ENDPOINTS for both endpoints and dma channels. However,
in sama5d3, it has different number for endpoints and DMA channels.
So, define a new macro USBA_NR_DMAs for DMA channels. And the
USBA_NR_ENDPOINS is not used anymore, remove it at the same time.
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r-- | drivers/usb/gadget/atmel_usba_udc.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/atmel_usba_udc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index 53eea030fc15..18a44919ae9f 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c | |||
@@ -1661,7 +1661,7 @@ static irqreturn_t usba_udc_irq(int irq, void *devid) | |||
1661 | if (dma_status) { | 1661 | if (dma_status) { |
1662 | int i; | 1662 | int i; |
1663 | 1663 | ||
1664 | for (i = 1; i < USBA_NR_ENDPOINTS; i++) | 1664 | for (i = 1; i < USBA_NR_DMAS; i++) |
1665 | if (dma_status & (1 << i)) | 1665 | if (dma_status & (1 << i)) |
1666 | usba_dma_irq(udc, &udc->usba_ep[i]); | 1666 | usba_dma_irq(udc, &udc->usba_ep[i]); |
1667 | } | 1667 | } |
diff --git a/drivers/usb/gadget/atmel_usba_udc.h b/drivers/usb/gadget/atmel_usba_udc.h index 2922db50befe..a70706e8cb02 100644 --- a/drivers/usb/gadget/atmel_usba_udc.h +++ b/drivers/usb/gadget/atmel_usba_udc.h | |||
@@ -210,7 +210,7 @@ | |||
210 | #define USBA_FIFO_BASE(x) ((x) << 16) | 210 | #define USBA_FIFO_BASE(x) ((x) << 16) |
211 | 211 | ||
212 | /* Synth parameters */ | 212 | /* Synth parameters */ |
213 | #define USBA_NR_ENDPOINTS 7 | 213 | #define USBA_NR_DMAS 7 |
214 | 214 | ||
215 | #define EP0_FIFO_SIZE 64 | 215 | #define EP0_FIFO_SIZE 64 |
216 | #define EP0_EPT_SIZE USBA_EPT_SIZE_64 | 216 | #define EP0_EPT_SIZE USBA_EPT_SIZE_64 |