X-Git-Url: https://git.ti.com/gitweb?p=sitara-epos%2Fsitara-epos-kernel.git;a=blobdiff_plain;f=drivers%2Fusb%2Fmusb%2Fcppi41_dma.c;h=b553d49931b1a8a03e946db1cbb1db054ed6332b;hp=b274732c13b737e54d7123ca5d1b1e79caedae12;hb=0fb57658825116986390442eef9ab344a71c8242;hpb=ffba7da43f90023e29a14104f1393ef2a57fbffb diff --git a/drivers/usb/musb/cppi41_dma.c b/drivers/usb/musb/cppi41_dma.c index b274732c13b7..b553d49931b1 100644 --- a/drivers/usb/musb/cppi41_dma.c +++ b/drivers/usb/musb/cppi41_dma.c @@ -191,7 +191,7 @@ static int __devinit cppi41_controller_start(struct dma_controller *controller) cppi_info = cppi->cppi_info; musb = cppi->musb; - if (cpu_is_ti81xx()) { + if (cpu_is_ti816x() || cpu_is_am33xx()) { cppi->automode_reg_offs = TI81XX_USB_AUTOREQ_REG; cppi->teardown_reg_offs = TI81XX_USB_TEARDOWN_REG; } else { @@ -1510,14 +1510,14 @@ static void usb_process_rx_queue(struct cppi41 *cppi, unsigned index) if (unlikely(rx_ch->channel.actual_len >= rx_ch->length || length < orig_buf_len)) { -#ifdef CONFIG_SOC_OMAPTI81XX +#if defined(CONFIG_SOC_OMAPTI81XX) || defined(CONFIG_SOC_OMAPAM33XX) struct musb_hw_ep *ep; u8 isoc, next_seg = 0; /* Workaround for early rx completion of * cppi41 dma in Generic RNDIS mode for ti81xx */ - if (cpu_is_ti81xx() && is_host_enabled(cppi->musb)) { + if (is_host_enabled(cppi->musb)) { u32 pkt_size = rx_ch->pkt_size; ep = cppi->musb->endpoints + ep_num; isoc = musb_readb(ep->regs, MUSB_RXTYPE);