|
@@ -629,7 +629,7 @@ static bool musb_tx_dma_program(struct dma_controller *dma,
|
|
|
u16 csr;
|
|
|
u8 mode;
|
|
|
|
|
|
-#ifdef CONFIG_USB_INVENTRA_DMA
|
|
|
+#if defined(CONFIG_USB_INVENTRA_DMA) || defined(CONFIG_USB_UX500_DMA)
|
|
|
if (length > channel->max_len)
|
|
|
length = channel->max_len;
|
|
|
|
|
@@ -1663,7 +1663,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
|
|
|
|
|
|
/* FIXME this is _way_ too much in-line logic for Mentor DMA */
|
|
|
|
|
|
-#ifndef CONFIG_USB_INVENTRA_DMA
|
|
|
+#if !defined(CONFIG_USB_INVENTRA_DMA) && !defined(CONFIG_USB_UX500_DMA)
|
|
|
if (rx_csr & MUSB_RXCSR_H_REQPKT) {
|
|
|
/* REVISIT this happened for a while on some short reads...
|
|
|
* the cleanup still needs investigation... looks bad...
|
|
@@ -1695,7 +1695,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
|
|
|
| MUSB_RXCSR_RXPKTRDY);
|
|
|
musb_writew(hw_ep->regs, MUSB_RXCSR, val);
|
|
|
|
|
|
-#ifdef CONFIG_USB_INVENTRA_DMA
|
|
|
+#if defined(CONFIG_USB_INVENTRA_DMA) || defined(CONFIG_USB_UX500_DMA)
|
|
|
if (usb_pipeisoc(pipe)) {
|
|
|
struct usb_iso_packet_descriptor *d;
|
|
|
|
|
@@ -1751,7 +1751,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
|
|
|
}
|
|
|
|
|
|
/* we are expecting IN packets */
|
|
|
-#ifdef CONFIG_USB_INVENTRA_DMA
|
|
|
+#if defined(CONFIG_USB_INVENTRA_DMA) || defined(CONFIG_USB_UX500_DMA)
|
|
|
if (dma) {
|
|
|
struct dma_controller *c;
|
|
|
u16 rx_count;
|