[U-Boot] [PATCH] usb: musb-new: Fix Inventra DMA support

[Marek Vasut]

The Inventra DMA support was clearly not compiled for a long time and
the isochronous transfer bits were not ifdeffed out, so do it. Fix a
warning generated by GCC about invalid format in printf() too.

Signed-off-by: Marek Vasut <marex at denx.de>
Cc: Jean-Jacques Hiblot <jjhiblot at ti.com>
Cc: Tom Rini <trini at konsulko.com>
---
 drivers/usb/musb-new/musb_host.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/musb-new/musb_host.c b/drivers/usb/musb-new/musb_host.c
index 8e92ade471..a4cf824d77 100644
--- a/drivers/usb/musb-new/musb_host.c
+++ b/drivers/usb/musb-new/musb_host.c
@@ -1581,6 +1581,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
 
 #ifdef CONFIG_USB_INVENTRA_DMA
 		if (usb_pipeisoc(pipe)) {
+#ifndef __UBOOT__
 			struct usb_iso_packet_descriptor *d;
 
 			d = urb->iso_frame_desc + qh->iso_idx;
@@ -1596,7 +1597,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
 				done = true;
 			else
 				done = false;
-
+#endif
 		} else  {
 		/* done if urb buffer is full or short packet is recd */
 		done = (urb->actual_length + xfer_len >=
@@ -1644,7 +1645,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
 
 			rx_count = musb_readw(epio, MUSB_RXCOUNT);
 
-			dev_dbg(musb->controller, "RX%d count %d, buffer 0x%x len %d/%d\n",
+			dev_dbg(musb->controller, "RX%d count %d, buffer 0x%llx len %d/%d\n",
 					epnum, rx_count,
 					urb->transfer_dma
 						+ urb->actual_length,
@@ -1654,6 +1655,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
 			c = musb->dma_controller;
 
 			if (usb_pipeisoc(pipe)) {
+#ifndef __UBOOT__
 				int d_status = 0;
 				struct usb_iso_packet_descriptor *d;
 
@@ -1676,6 +1678,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
 					length = rx_count;
 				d->status = d_status;
 				buf = urb->transfer_dma + d->offset;
+#endif
 			} else {
 				length = rx_count;
 				buf = urb->transfer_dma +
-- 
2.20.1