Commit afe5ba76 authored by Tony Lindgren's avatar Tony Lindgren

musb: Search and replace USB_INVENTRA_FIFO with MUSB_PIO_ONLY

Search and replace USB_INVENTRA_FIFO with MUSB_PIO_ONLY
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 16153ee4
......@@ -129,7 +129,7 @@ config USB_MUSB_HDRC_HCD
default y
config USB_INVENTRA_FIFO
config MUSB_PIO_ONLY
bool 'Disable DMA (always use PIO)'
depends on USB_MUSB_HDRC
default y if USB_TUSB6010
......@@ -144,21 +144,21 @@ config USB_INVENTRA_FIFO
config USB_INVENTRA_DMA
bool
depends on USB_MUSB_HDRC && !USB_INVENTRA_FIFO
depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
default ARCH_OMAP2430 || ARCH_OMAP343X
help
Enable DMA transfers using Mentor's engine.
config USB_TI_CPPI_DMA
bool
depends on USB_MUSB_HDRC && !USB_INVENTRA_FIFO
depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
default ARCH_DAVINCI
help
Enable DMA transfers when TI CPPI DMA is available.
config USB_TUSB_OMAP_DMA
bool
depends on USB_MUSB_HDRC && !USB_INVENTRA_FIFO
depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
depends on USB_TUSB6010
depends on ARCH_OMAP
default y
......
......@@ -28,10 +28,10 @@ endif
# the kconfig must guarantee that only one of the
# possible I/O schemes will be enabled at a time ...
# PIO (INVENTRA_FIFO), or DMA (several potential schemes).
# PIO only, or DMA (several potential schemes).
# though PIO is always there to back up DMA, and for ep0
ifneq ($(CONFIG_USB_INVENTRA_FIFO),y)
ifneq ($(CONFIG_MUSB_PIO_ONLY),y)
ifeq ($(CONFIG_USB_INVENTRA_DMA),y)
musb_hdrc-objs += musbhsdma.o
......
......@@ -62,7 +62,7 @@ struct musb_hw_ep;
#define DMA_ADDR_INVALID (~(dma_addr_t)0)
#ifndef CONFIG_USB_INVENTRA_FIFO
#ifndef CONFIG_MUSB_PIO_ONLY
#define is_dma_capable() (1)
#else
#define is_dma_capable() (0)
......
......@@ -291,7 +291,7 @@ static void txstate(struct musb *musb, struct musb_request *req)
epnum, musb_ep->packet_sz, fifo_count,
csr);
#ifndef CONFIG_USB_INVENTRA_FIFO
#ifndef CONFIG_MUSB_PIO_ONLY
if (is_dma_capable() && musb_ep->dma) {
struct dma_controller *c = musb->dma_controller;
......
......@@ -508,7 +508,7 @@ static int dump_header_stats(struct musb *musb, char *buffer)
code = sprintf(buffer,
"Options: "
#ifdef CONFIG_USB_INVENTRA_FIFO
#ifdef CONFIG_MUSB_PIO_ONLY
"pio"
#elif defined(CONFIG_USB_TI_CPPI_DMA)
"cppi-dma"
......
......@@ -1531,7 +1531,7 @@ irqreturn_t musb_interrupt(struct musb *musb)
}
#ifndef CONFIG_USB_INVENTRA_FIFO
#ifndef CONFIG_MUSB_PIO_ONLY
static int __initdata use_dma = 1;
/* "modprobe ... use_dma=0" etc */
......@@ -1921,7 +1921,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
goto fail2;
}
#ifndef CONFIG_USB_INVENTRA_FIFO
#ifndef CONFIG_MUSB_PIO_ONLY
if (use_dma && dev->dma_mask) {
struct dma_controller *c;
......@@ -2050,7 +2050,7 @@ fail2:
* bridge to a platform device; this driver then suffices.
*/
#ifndef CONFIG_USB_INVENTRA_FIFO
#ifndef CONFIG_MUSB_PIO_ONLY
static u64 *orig_dma_mask;
#endif
......@@ -2071,7 +2071,7 @@ static int __init musb_probe(struct platform_device *pdev)
return -ENOMEM;
}
#ifndef CONFIG_USB_INVENTRA_FIFO
#ifndef CONFIG_MUSB_PIO_ONLY
/* clobbered by use_dma=n */
orig_dma_mask = dev->dma_mask;
#endif
......@@ -2097,7 +2097,7 @@ static int __devexit musb_remove(struct platform_device *pdev)
musb_free(musb);
iounmap(ctrl_base);
device_init_wakeup(&pdev->dev, 0);
#ifndef CONFIG_USB_INVENTRA_FIFO
#ifndef CONFIG_MUSB_PIO_ONLY
pdev->dev.dma_mask = orig_dma_mask;
#endif
return 0;
......@@ -2183,7 +2183,7 @@ static int __init musb_init(void)
#endif
pr_info("%s: version " MUSB_VERSION ", "
#ifdef CONFIG_USB_INVENTRA_FIFO
#ifdef CONFIG_MUSB_PIO_ONLY
"pio"
#elif defined(CONFIG_USB_TI_CPPI_DMA)
"cppi-dma"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment