Unverified Commit e86caa01 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Mark Brown
Browse files

ASoC: tegra: SND_SOC_TEGRA_AUDIO_GRAPH_CARD should depend on SND_SOC_TEGRA 



Audio Graph Card based Tegra driver is only useful on NVIDIA Tegra SoCs.
Hence add a dependency on SND_SOC_TEGRA, to prevent asking the user
about this driver when configuring a kernel without Tegra sound support.

Wrap all Tegra sound config options inside a big if/endif block, instead
of just adding the dependency to the single config option that does not
have it yet, to preventing similar future mistakes.

Fixes: 202e2f77 ("ASoC: tegra: Add audio graph based card driver")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarSameer Pujar <spujar@nvidia.com>
Link: https://lore.kernel.org/r/20210129125915.2652952-1-geert+renesas@glider.be


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8ac9e476

sound/soc/tegra/Kconfig

+13 −20
Original line number Diff line number Diff line
@@ -9,9 +9,10 @@ config SND_SOC_TEGRA 
	help

	  Say Y or M here if you want support for SoC audio on Tegra.



if SND_SOC_TEGRA



config SND_SOC_TEGRA20_AC97

	tristate "Tegra20 AC97 interface"

	depends on SND_SOC_TEGRA

	select SND_SOC_AC97_BUS

	select SND_SOC_TEGRA20_DAS

	help
@@ -21,7 +22,6 @@ config SND_SOC_TEGRA20_AC97 


config SND_SOC_TEGRA20_DAS

	tristate "Tegra20 DAS module"

	depends on SND_SOC_TEGRA

	help

	  Say Y or M if you want to add support for the Tegra20 DAS module.

	  You will also need to select the individual machine drivers to
@@ -29,7 +29,6 @@ config SND_SOC_TEGRA20_DAS 


config SND_SOC_TEGRA20_I2S

	tristate "Tegra20 I2S interface"

	depends on SND_SOC_TEGRA

	select SND_SOC_TEGRA20_DAS

	help

	  Say Y or M if you want to add support for codecs attached to the
@@ -38,7 +37,6 @@ config SND_SOC_TEGRA20_I2S 


config SND_SOC_TEGRA20_SPDIF

	tristate "Tegra20 SPDIF interface"

	depends on SND_SOC_TEGRA

	help

	  Say Y or M if you want to add support for the Tegra20 SPDIF interface.

	  You will also need to select the individual machine drivers to support
@@ -46,7 +44,6 @@ config SND_SOC_TEGRA20_SPDIF 


config SND_SOC_TEGRA30_AHUB

	tristate "Tegra30 AHUB module"

	depends on SND_SOC_TEGRA

	help

	  Say Y or M if you want to add support for the Tegra30 AHUB module.

	  You will also need to select the individual machine drivers to
@@ -54,7 +51,6 @@ config SND_SOC_TEGRA30_AHUB 


config SND_SOC_TEGRA30_I2S

	tristate "Tegra30 I2S interface"

	depends on SND_SOC_TEGRA

	select SND_SOC_TEGRA30_AHUB

	help

	  Say Y or M if you want to add support for codecs attached to the
@@ -63,7 +59,6 @@ config SND_SOC_TEGRA30_I2S 


config SND_SOC_TEGRA210_AHUB

	tristate "Tegra210 AHUB module"

	depends on SND_SOC_TEGRA

	help

	  Config to enable Audio Hub (AHUB) module, which comprises of a

	  switch called Audio Crossbar (AXBAR) used to configure or modify
@@ -73,7 +68,6 @@ config SND_SOC_TEGRA210_AHUB 


config SND_SOC_TEGRA210_DMIC

	tristate "Tegra210 DMIC module"

	depends on SND_SOC_TEGRA

	help

	  Config to enable the Digital MIC (DMIC) controller which is used

	  to interface with Pulse Density Modulation (PDM) input devices.
@@ -84,7 +78,6 @@ config SND_SOC_TEGRA210_DMIC 


config SND_SOC_TEGRA210_I2S

	tristate "Tegra210 I2S module"

	depends on SND_SOC_TEGRA

	help

	  Config to enable the Inter-IC Sound (I2S) Controller which

	  implements full-duplex and bidirectional and single direction
@@ -94,7 +87,6 @@ config SND_SOC_TEGRA210_I2S 


config SND_SOC_TEGRA186_DSPK

	tristate "Tegra186 DSPK module"

	depends on SND_SOC_TEGRA

	help

	  Config to enable the Digital Speaker Controller (DSPK) which

	  converts the multi-bit Pulse Code Modulation (PCM) audio input to
@@ -107,7 +99,6 @@ config SND_SOC_TEGRA186_DSPK 


config SND_SOC_TEGRA210_ADMAIF

	tristate "Tegra210 ADMAIF module"

	depends on SND_SOC_TEGRA

	help

	  Config to enable ADMAIF which is the interface between ADMA and

	  Audio Hub (AHUB). Each ADMA channel that sends/receives data to/
@@ -128,7 +119,7 @@ config SND_SOC_TEGRA_AUDIO_GRAPH_CARD 


config SND_SOC_TEGRA_RT5640

	tristate "SoC Audio support for Tegra boards using an RT5640 codec"

	depends on SND_SOC_TEGRA && I2C && GPIOLIB

	depends on I2C && GPIOLIB

	select SND_SOC_RT5640

	help

	  Say Y or M here if you want to add support for SoC audio on Tegra
@@ -136,7 +127,7 @@ config SND_SOC_TEGRA_RT5640 


config SND_SOC_TEGRA_WM8753

	tristate "SoC Audio support for Tegra boards using a WM8753 codec"

	depends on SND_SOC_TEGRA && I2C && GPIOLIB

	depends on I2C && GPIOLIB

	select SND_SOC_WM8753

	help

	  Say Y or M here if you want to add support for SoC audio on Tegra
@@ -144,7 +135,7 @@ config SND_SOC_TEGRA_WM8753 


config SND_SOC_TEGRA_WM8903

	tristate "SoC Audio support for Tegra boards using a WM8903 codec"

	depends on SND_SOC_TEGRA && I2C && GPIOLIB

	depends on I2C && GPIOLIB

	select SND_SOC_WM8903

	help

	  Say Y or M here if you want to add support for SoC audio on Tegra
@@ -153,7 +144,7 @@ config SND_SOC_TEGRA_WM8903 


config SND_SOC_TEGRA_WM9712

	tristate "SoC Audio support for Tegra boards using a WM9712 codec"

	depends on SND_SOC_TEGRA && GPIOLIB

	depends on GPIOLIB

	select SND_SOC_TEGRA20_AC97

	select SND_SOC_WM9712

	help
@@ -162,7 +153,7 @@ config SND_SOC_TEGRA_WM9712 


config SND_SOC_TEGRA_TRIMSLICE

	tristate "SoC Audio support for TrimSlice board"

	depends on SND_SOC_TEGRA && I2C

	depends on I2C

	select SND_SOC_TLV320AIC23_I2C

	help

	  Say Y or M here if you want to add support for SoC audio on the
@@ -170,7 +161,7 @@ config SND_SOC_TEGRA_TRIMSLICE 


config SND_SOC_TEGRA_ALC5632

	tristate "SoC Audio support for Tegra boards using an ALC5632 codec"

	depends on SND_SOC_TEGRA && I2C && GPIOLIB

	depends on I2C && GPIOLIB

	select SND_SOC_ALC5632

	help

	  Say Y or M here if you want to add support for SoC audio on the
@@ -178,7 +169,7 @@ config SND_SOC_TEGRA_ALC5632 


config SND_SOC_TEGRA_MAX98090

	tristate "SoC Audio support for Tegra boards using a MAX98090 codec"

	depends on SND_SOC_TEGRA && I2C && GPIOLIB

	depends on I2C && GPIOLIB

	select SND_SOC_MAX98090

	help

	  Say Y or M here if you want to add support for SoC audio on Tegra
@@ -186,7 +177,7 @@ config SND_SOC_TEGRA_MAX98090 


config SND_SOC_TEGRA_RT5677

	tristate "SoC Audio support for Tegra boards using a RT5677 codec"

	depends on SND_SOC_TEGRA && I2C && GPIOLIB

	depends on I2C && GPIOLIB

	select SND_SOC_RT5677

	help

	  Say Y or M here if you want to add support for SoC audio on Tegra
@@ -194,9 +185,11 @@ config SND_SOC_TEGRA_RT5677 


config SND_SOC_TEGRA_SGTL5000

	tristate "SoC Audio support for Tegra boards using a SGTL5000 codec"

	depends on SND_SOC_TEGRA && I2C && GPIOLIB

	depends on I2C && GPIOLIB

	select SND_SOC_SGTL5000

	help

	  Say Y or M here if you want to add support for SoC audio on Tegra

	  boards using the SGTL5000 codec, such as Apalis T30, Apalis TK1 or

	  Colibri T30.



endif