Commit 36a52ae6 authored by Niklas Schnelle's avatar Niklas Schnelle Committed by Takashi Iwai
Browse files

ALSA: add HAS_IOPORT dependencies 



In a future patch HAS_IOPORT=n will result in inb()/outb() and friends
not being declared. We thus need to add HAS_IOPORT as dependency for
those drivers using them.

Co-developed-by: default avatarArnd Bergmann <arnd@kernel.org>
Signed-off-by: default avatarArnd Bergmann <arnd@kernel.org>
Signed-off-by: default avatarNiklas Schnelle <schnelle@linux.ibm.com>
Acked-by: default avatarJaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20230522105049.1467313-33-schnelle@linux.ibm.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 4040fc51

sound/drivers/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ config SND_VIRMIDI 


config SND_MTPAV

	tristate "MOTU MidiTimePiece AV multiport MIDI"

	depends on HAS_IOPORT

	select SND_RAWMIDI

	help

	  To use a MOTU MidiTimePiece AV multiport MIDI adapter
@@ -152,6 +153,7 @@ config SND_MTS64 


config SND_SERIAL_U16550

	tristate "UART16550 serial MIDI driver"

	depends on HAS_IOPORT

	select SND_RAWMIDI

	help

	  To include support for MIDI serial port interfaces, say Y here
@@ -185,6 +187,7 @@ config SND_SERIAL_GENERIC 


config SND_MPU401

	tristate "Generic MPU-401 UART driver"

	depends on HAS_IOPORT

	select SND_MPU401_UART

	help

	  Say Y here to include support for MIDI ports compatible with

sound/isa/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ menuconfig SND_ISA 
	bool "ISA sound devices"

	depends on ISA || COMPILE_TEST

	depends on ISA_DMA_API

	depends on HAS_IOPORT

	default y

	help

	  Support for sound devices connected via the ISA bus.

sound/pci/Kconfig

+34 −11
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ config SND_ALS300 
	select SND_PCM

	select SND_AC97_CODEC

	select SND_OPL3_LIB

	depends on ZONE_DMA

	depends on ZONE_DMA && HAS_IOPORT

	help

	  Say 'Y' or 'M' to include support for Avance Logic ALS300/ALS300+
@@ -36,6 +36,7 @@ config SND_ALS300 
config SND_ALS4000

	tristate "Avance Logic ALS4000"

	depends on ISA_DMA_API

	depends on HAS_IOPORT

	select SND_OPL3_LIB

	select SND_MPU401_UART

	select SND_PCM
@@ -51,7 +52,7 @@ config SND_ALI5451 
	tristate "ALi M5451 PCI Audio Controller"

	select SND_MPU401_UART

	select SND_AC97_CODEC

	depends on ZONE_DMA

	depends on ZONE_DMA && HAS_IOPORT

	help

	  Say Y here to include support for the integrated AC97 sound

	  device on motherboards using the ALi M5451 Audio Controller
@@ -96,6 +97,7 @@ config SND_ATIIXP_MODEM 


config SND_AU8810

	tristate "Aureal Advantage"

	depends on HAS_IOPORT

	select SND_MPU401_UART

	select SND_AC97_CODEC

	help
@@ -110,6 +112,7 @@ config SND_AU8810 


config SND_AU8820

	tristate "Aureal Vortex"

	depends on HAS_IOPORT

	select SND_MPU401_UART

	select SND_AC97_CODEC

	help
@@ -123,6 +126,7 @@ config SND_AU8820 


config SND_AU8830

	tristate "Aureal Vortex 2"

	depends on HAS_IOPORT

	select SND_MPU401_UART

	select SND_AC97_CODEC

	help
@@ -157,7 +161,7 @@ config SND_AZT3328 
	select SND_RAWMIDI

	select SND_AC97_CODEC

	select SND_TIMER

	depends on ZONE_DMA

	depends on ZONE_DMA && HAS_IOPORT

	help

	  Say Y here to include support for Aztech AZF3328 (PCI168)

	  soundcards.
@@ -193,6 +197,7 @@ config SND_BT87X_OVERCLOCK 


config SND_CA0106

	tristate "SB Audigy LS / Live 24bit"

	depends on HAS_IOPORT

	select SND_AC97_CODEC

	select SND_RAWMIDI

	select SND_VMASTER
@@ -205,6 +210,7 @@ config SND_CA0106 


config SND_CMIPCI

	tristate "C-Media 8338, 8738, 8768, 8770"

	depends on HAS_IOPORT

	select SND_OPL3_LIB

	select SND_MPU401_UART

	select SND_PCM
@@ -221,6 +227,7 @@ config SND_OXYGEN_LIB 


config SND_OXYGEN

	tristate "C-Media 8786, 8787, 8788 (Oxygen)"

	depends on HAS_IOPORT

	select SND_OXYGEN_LIB

	select SND_PCM

	select SND_MPU401_UART
@@ -246,6 +253,7 @@ config SND_OXYGEN 


config SND_CS4281

	tristate "Cirrus Logic (Sound Fusion) CS4281"

	depends on HAS_IOPORT

	select SND_OPL3_LIB

	select SND_RAWMIDI

	select SND_AC97_CODEC
@@ -257,6 +265,7 @@ config SND_CS4281 


config SND_CS46XX

	tristate "Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x"

	depends on HAS_IOPORT

	select SND_RAWMIDI

	select SND_AC97_CODEC

	select FW_LOADER
@@ -290,6 +299,7 @@ config SND_CS5530 
config SND_CS5535AUDIO

	tristate "CS5535/CS5536 Audio"

	depends on X86_32 || MIPS || COMPILE_TEST

	depends on HAS_IOPORT

	select SND_PCM

	select SND_AC97_CODEC

	help
@@ -307,6 +317,7 @@ config SND_CS5535AUDIO 


config SND_CTXFI

	tristate "Creative Sound Blaster X-Fi"

	depends on HAS_IOPORT

	select SND_PCM

	help

	  If you want to use soundcards based on Creative Sound Blastr X-Fi
@@ -468,7 +479,7 @@ config SND_EMU10K1 
	select SND_AC97_CODEC

	select SND_TIMER

	select SND_SEQ_DEVICE if SND_SEQUENCER != n

	depends on ZONE_DMA

	depends on ZONE_DMA && HAS_IOPORT

	help

	  Say Y to include support for Sound Blaster PCI 512, Live!,

	  Audigy and E-MU APS/0404/1010/1212/1616/1820 soundcards.
@@ -491,7 +502,7 @@ config SND_EMU10K1X 
	tristate "Emu10k1X (Dell OEM Version)"

	select SND_AC97_CODEC

	select SND_RAWMIDI

	depends on ZONE_DMA

	depends on ZONE_DMA && HAS_IOPORT

	help

	  Say Y here to include support for the Dell OEM version of the

	  Sound Blaster Live!.
@@ -501,6 +512,7 @@ config SND_EMU10K1X 


config SND_ENS1370

	tristate "(Creative) Ensoniq AudioPCI 1370"

	depends on HAS_IOPORT

	select SND_RAWMIDI

	select SND_PCM

	help
@@ -511,6 +523,7 @@ config SND_ENS1370 


config SND_ENS1371

	tristate "(Creative) Ensoniq AudioPCI 1371/1373"

	depends on HAS_IOPORT

	select SND_RAWMIDI

	select SND_AC97_CODEC

	help
@@ -525,7 +538,7 @@ config SND_ES1938 
	select SND_OPL3_LIB

	select SND_MPU401_UART

	select SND_AC97_CODEC

	depends on ZONE_DMA

	depends on ZONE_DMA && HAS_IOPORT

	help

	  Say Y here to include support for soundcards based on ESS Solo-1

	  (ES1938, ES1946, ES1969) chips.
@@ -537,7 +550,7 @@ config SND_ES1968 
	tristate "ESS ES1968/1978 (Maestro-1/2/2E)"

	select SND_MPU401_UART

	select SND_AC97_CODEC

	depends on ZONE_DMA

	depends on ZONE_DMA && HAS_IOPORT

	help

	  Say Y here to include support for soundcards based on ESS Maestro

	  1/2/2E chips.
@@ -569,6 +582,7 @@ config SND_ES1968_RADIO 


config SND_FM801

	tristate "ForteMedia FM801"

	depends on HAS_IOPORT

	select SND_OPL3_LIB

	select SND_MPU401_UART

	select SND_AC97_CODEC
@@ -624,7 +638,7 @@ config SND_ICE1712 
	select SND_MPU401_UART

	select SND_AC97_CODEC

	select BITREVERSE

	depends on ZONE_DMA

	depends on ZONE_DMA && HAS_IOPORT

	help

	  Say Y here to include support for soundcards based on the

	  ICE1712 (Envy24) chip.
@@ -640,6 +654,7 @@ config SND_ICE1712 


config SND_ICE1724

	tristate "ICE/VT1724/1720 (Envy24HT/PT)"

	depends on HAS_IOPORT

	select SND_RAWMIDI

	select SND_AC97_CODEC

	select SND_VMASTER
@@ -712,7 +727,7 @@ config SND_LX6464ES 
config SND_MAESTRO3

	tristate "ESS Allegro/Maestro3"

	select SND_AC97_CODEC

	depends on ZONE_DMA

	depends on ZONE_DMA && HAS_IOPORT

	help

	  Say Y here to include support for soundcards based on ESS Maestro 3

	  (Allegro) chips.
@@ -753,6 +768,7 @@ config SND_NM256 


config SND_PCXHR

	tristate "Digigram PCXHR"

	depends on HAS_IOPORT

	select FW_LOADER

	select SND_PCM

	select SND_HWDEP
@@ -764,6 +780,7 @@ config SND_PCXHR 


config SND_RIPTIDE

	tristate "Conexant Riptide"

	depends on HAS_IOPORT

	select FW_LOADER

	select SND_OPL3_LIB

	select SND_MPU401_UART
@@ -808,6 +825,7 @@ config SND_RME9652 
config SND_SE6X

	tristate "Studio Evolution SE6X"

	depends on SND_OXYGEN=n && SND_VIRTUOSO=n  # PCI ID conflict

	depends on HAS_IOPORT

	select SND_OXYGEN_LIB

	select SND_PCM

	select SND_MPU401_UART
@@ -830,7 +848,7 @@ config SND_SONICVIBES 
	select SND_OPL3_LIB

	select SND_MPU401_UART

	select SND_AC97_CODEC

	depends on ZONE_DMA

	depends on ZONE_DMA && HAS_IOPORT

	help

	  Say Y here to include support for soundcards based on the S3

	  SonicVibes chip.
@@ -842,7 +860,7 @@ config SND_TRIDENT 
	tristate "Trident 4D-Wave DX/NX; SiS 7018"

	select SND_MPU401_UART

	select SND_AC97_CODEC

	depends on ZONE_DMA

	depends on ZONE_DMA && HAS_IOPORT

	help

	  Say Y here to include support for soundcards based on Trident

	  4D-Wave DX/NX or SiS 7018 chips.
@@ -852,6 +870,7 @@ config SND_TRIDENT 


config SND_VIA82XX

	tristate "VIA 82C686A/B, 8233/8235 AC97 Controller"

	depends on HAS_IOPORT

	select SND_MPU401_UART

	select SND_AC97_CODEC

	help
@@ -863,6 +882,7 @@ config SND_VIA82XX 


config SND_VIA82XX_MODEM

	tristate "VIA 82C686A/B, 8233 based Modems"

	depends on HAS_IOPORT

	select SND_AC97_CODEC

	help

	  Say Y here to include support for the integrated MC97 modem on
@@ -873,6 +893,7 @@ config SND_VIA82XX_MODEM 


config SND_VIRTUOSO

	tristate "Asus Virtuoso 66/100/200 (Xonar)"

	depends on HAS_IOPORT

	select SND_OXYGEN_LIB

	select SND_PCM

	select SND_MPU401_UART
@@ -889,6 +910,7 @@ config SND_VIRTUOSO 


config SND_VX222

	tristate "Digigram VX222"

	depends on HAS_IOPORT

	select SND_VX_LIB

	help

	  Say Y here to include support for Digigram VX222 soundcards.
@@ -898,6 +920,7 @@ config SND_VX222 


config SND_YMFPCI

	tristate "Yamaha YMF724/740/744/754"

	depends on HAS_IOPORT

	select SND_OPL3_LIB

	select SND_MPU401_UART

	select SND_AC97_CODEC

sound/pcmcia/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
menuconfig SND_PCMCIA

	bool "PCMCIA sound devices"

	depends on PCMCIA

	depends on HAS_IOPORT

	default y

	help

	  Support for sound devices connected via the PCMCIA bus.