Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f0bb2a0 authored by Tony Lindgren's avatar Tony Lindgren Committed by Felipe Balbi
Browse files

usb: musb: Allow building in all the DMA code 



With recent changes to MUSB code, we can now now get rid of
the Kconfig choise for the DMA code and allow building in any
of the desired DMA code. This makes life easier for distros.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent d3cb25a1

drivers/usb/musb/Kconfig

+14 −24
Original line number Diff line number Diff line
@@ -124,19 +124,20 @@ config USB_MUSB_JZ4740 
config USB_MUSB_AM335X_CHILD

	tristate



choice

	prompt 'MUSB DMA mode'

	default MUSB_PIO_ONLY if ARCH_MULTIPLATFORM || USB_MUSB_JZ4740

	default USB_UX500_DMA if USB_MUSB_UX500

	default USB_INVENTRA_DMA if USB_MUSB_OMAP2PLUS || USB_MUSB_BLACKFIN

	default USB_TI_CPPI_DMA if USB_MUSB_DAVINCI

	default USB_TUSB_OMAP_DMA if USB_MUSB_TUSB6010

	default MUSB_PIO_ONLY if USB_MUSB_TUSB6010 || USB_MUSB_DA8XX || USB_MUSB_AM35X \

				|| USB_MUSB_DSPS

comment "MUSB DMA mode"



config MUSB_PIO_ONLY

	bool 'Disable DMA (always use PIO)'

	help

	  Unfortunately, only one option can be enabled here. Ideally one

	  should be able to build all these drivers into one kernel to

	  allow using DMA on multiplatform kernels.

	  All data is copied between memory and FIFO by the CPU.

	  DMA controllers are ignored.



	  Do not choose this unless DMA support for your SOC or board

	  is unavailable (or unstable).  When DMA is enabled at compile time,

	  you can still disable it at run time using the "use_dma=n" module

	  parameter.



if !MUSB_PIO_ONLY



config USB_UX500_DMA

	bool 'ST Ericsson Ux500'
@@ -168,17 +169,6 @@ config USB_TUSB_OMAP_DMA 
	help

	  Enable DMA transfers on TUSB 6010 when OMAP DMA is available.



config MUSB_PIO_ONLY

	bool 'Disable DMA (always use PIO)'

	help

	  All data is copied between memory and FIFO by the CPU.

	  DMA controllers are ignored.



	  Do not choose this unless DMA support for your SOC or board

	  is unavailable (or unstable).  When DMA is enabled at compile time,

	  you can still disable it at run time using the "use_dma=n" module

	  parameter.



endchoice

endif # !MUSB_PIO_ONLY



endif # USB_MUSB_HDRC