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

Commit 5cae841b authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] ISA DMA Kconfig fixes - part 1 



A bunch of drivers use ISA DMA helpers or their equivalents for
platforms that have ISA with different DMA controller (a lot of ARM
boxen).  Currently there is no way to put such dependency in Kconfig -
CONFIG_ISA is not it (e.g.  it is not set on platforms that have no ISA
slots, but have on-board devices that pretend to be ISA ones).

New symbol added - ISA_DMA_API.  Set when we have functional
enable_dma()/set_dma_mode()/etc.  set of helpers.  Next patches in the
series will add missing dependencies for drivers that need them.

I'm very carefully staying the hell out of the recurring flamefest on
what exactly CONFIG_ISA would mean in ideal world - added symbol has a
well-defined meaning and for now I really want to treat it as completely
independent from the mess around CONFIG_ISA.

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9b52523a

arch/alpha/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -280,6 +280,10 @@ config ISA 
	  (MCA) or VESA.  ISA is an older system, now being displaced by PCI;

	  newer boards don't support it.  If you have ISA, say Y, otherwise N.



config ISA_DMA_API

	bool

	default y



config PCI

	bool

	depends on !ALPHA_JENSEN

arch/arm/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -266,6 +266,10 @@ config ISA_DMA 
	depends on FOOTBRIDGE_HOST || ARCH_SHARK

	default y



config ISA_DMA_API

	bool

	default y



config PCI

	bool "PCI support" if ARCH_INTEGRATOR_AP

	default y if ARCH_SHARK || FOOTBRIDGE_HOST || ARCH_IOP3XX || ARCH_IXP4XX || ARCH_IXP2000

arch/arm26/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -89,6 +89,10 @@ config PAGESIZE_16 
          machine with 4MB of memory.

endmenu



config ISA_DMA_API

	bool

	default y



menu "General setup"



# Compressed boot loader in ROM.  Yes, we really want to ask about

arch/i386/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -1173,6 +1173,10 @@ source "drivers/pci/pcie/Kconfig" 


source "drivers/pci/Kconfig"



config ISA_DMA_API

	bool

	default y



config ISA

	bool "ISA support"

	depends on !(X86_VOYAGER || X86_VISWS)

arch/m68knommu/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -534,6 +534,11 @@ endchoice 


endmenu



config ISA_DMA_API

	bool

	depends on !M5272

	default y



menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"



config PCI