Commit 3bcfe80f authored by Paul Kocialkowski's avatar Paul Kocialkowski Committed by Mark Brown
Browse files

ASoC: tegra: Remove SoC-specific Kconfig depends and selects 



This removes the SoC-specific dependencies on the platform drivers,
as well as SoC-specific selections of platform drivers for the
machine drivers. The rationale behind this change is that the
dependencies are not actual build dependencies but run-time ones.

The previously listed SoCs were also incomplete: for instance, tegra124
uses the tegra30 platform drivers, which could not be built without
ARCH_TEGRA_3x_SOC set.

Descriptions of the tristates are also added to allow these options
to be set via defconfig/menuconfig.

Signed-off-by: default avatarPaul Kocialkowski <contact@paulk.fr>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 181e8ce6

sound/soc/tegra/Kconfig

+14 −28
Original line number Original line Diff line number Diff line
@@ -9,8 +9,8 @@ config SND_SOC_TEGRA 
	  Say Y or M here if you want support for SoC audio on Tegra.

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





config SND_SOC_TEGRA20_AC97

config SND_SOC_TEGRA20_AC97

	tristate

	tristate "Tegra20 AC97 interface"

	depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC

	depends on SND_SOC_TEGRA

	select SND_SOC_AC97_BUS

	select SND_SOC_AC97_BUS

	select SND_SOC_TEGRA20_DAS

	select SND_SOC_TEGRA20_DAS

	help

	help
@@ -19,16 +19,16 @@ config SND_SOC_TEGRA20_AC97 
	  machine drivers to support below.

	  machine drivers to support below.





config SND_SOC_TEGRA20_DAS

config SND_SOC_TEGRA20_DAS

	tristate

	tristate "Tegra20 DAS module"

	depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC

	depends on SND_SOC_TEGRA

	help

	help

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

	  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

	  You will also need to select the individual machine drivers to

	  support below.

	  support below.





config SND_SOC_TEGRA20_I2S

config SND_SOC_TEGRA20_I2S

	tristate

	tristate "Tegra20 I2S interface"

	depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC

	depends on SND_SOC_TEGRA

	select SND_SOC_TEGRA20_DAS

	select SND_SOC_TEGRA20_DAS

	help

	help

	  Say Y or M if you want to add support for codecs attached to the

	  Say Y or M if you want to add support for codecs attached to the
@@ -36,8 +36,8 @@ config SND_SOC_TEGRA20_I2S 
	  machine drivers to support below.

	  machine drivers to support below.





config SND_SOC_TEGRA20_SPDIF

config SND_SOC_TEGRA20_SPDIF

	tristate

	tristate "Tegra20 SPDIF interface"

	depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC

	depends on SND_SOC_TEGRA

	default m

	default m

	help

	help

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

	  Say Y or M if you want to add support for the Tegra20 SPDIF interface.
@@ -45,16 +45,16 @@ config SND_SOC_TEGRA20_SPDIF 
	  below.

	  below.





config SND_SOC_TEGRA30_AHUB

config SND_SOC_TEGRA30_AHUB

	tristate

	tristate "Tegra30 AHUB module"

	depends on SND_SOC_TEGRA && ARCH_TEGRA_3x_SOC

	depends on SND_SOC_TEGRA

	help

	help

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

	  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

	  You will also need to select the individual machine drivers to

	  support below.

	  support below.





config SND_SOC_TEGRA30_I2S

config SND_SOC_TEGRA30_I2S

	tristate

	tristate "Tegra30 I2S interface"

	depends on SND_SOC_TEGRA && ARCH_TEGRA_3x_SOC

	depends on SND_SOC_TEGRA

	select SND_SOC_TEGRA30_AHUB

	select SND_SOC_TEGRA30_AHUB

	help

	help

	  Say Y or M if you want to add support for codecs attached to the

	  Say Y or M if you want to add support for codecs attached to the
@@ -64,8 +64,6 @@ config SND_SOC_TEGRA30_I2S 
config SND_SOC_TEGRA_RT5640

config SND_SOC_TEGRA_RT5640

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

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

	depends on SND_SOC_TEGRA && I2C && GPIOLIB

	depends on SND_SOC_TEGRA && I2C && GPIOLIB

	select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC

	select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC

	select SND_SOC_RT5640

	select SND_SOC_RT5640

	help

	help

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

	  Say Y or M here if you want to add support for SoC audio on Tegra
@@ -74,8 +72,6 @@ config SND_SOC_TEGRA_RT5640 
config SND_SOC_TEGRA_WM8753

config SND_SOC_TEGRA_WM8753

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

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

	depends on SND_SOC_TEGRA && I2C && GPIOLIB

	depends on SND_SOC_TEGRA && I2C && GPIOLIB

	select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC

	select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC

	select SND_SOC_WM8753

	select SND_SOC_WM8753

	help

	help

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

	  Say Y or M here if you want to add support for SoC audio on Tegra
@@ -84,8 +80,6 @@ config SND_SOC_TEGRA_WM8753 
config SND_SOC_TEGRA_WM8903

config SND_SOC_TEGRA_WM8903

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

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

	depends on SND_SOC_TEGRA && I2C && GPIOLIB

	depends on SND_SOC_TEGRA && I2C && GPIOLIB

	select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC

	select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC

	select SND_SOC_WM8903

	select SND_SOC_WM8903

	help

	help

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

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




config SND_SOC_TEGRA_WM9712

config SND_SOC_TEGRA_WM9712

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

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

	depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC && GPIOLIB

	depends on SND_SOC_TEGRA && GPIOLIB

	select SND_SOC_TEGRA20_AC97

	select SND_SOC_TEGRA20_AC97

	select SND_SOC_WM9712

	select SND_SOC_WM9712

	help

	help
@@ -104,7 +98,6 @@ config SND_SOC_TEGRA_WM9712 
config SND_SOC_TEGRA_TRIMSLICE

config SND_SOC_TEGRA_TRIMSLICE

	tristate "SoC Audio support for TrimSlice board"

	tristate "SoC Audio support for TrimSlice board"

	depends on SND_SOC_TEGRA && I2C

	depends on SND_SOC_TEGRA && I2C

	select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC

	select SND_SOC_TLV320AIC23_I2C

	select SND_SOC_TLV320AIC23_I2C

	help

	help

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

	  Say Y or M here if you want to add support for SoC audio on the
@@ -113,7 +106,6 @@ config SND_SOC_TEGRA_TRIMSLICE 
config SND_SOC_TEGRA_ALC5632

config SND_SOC_TEGRA_ALC5632

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

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

	depends on SND_SOC_TEGRA && I2C && GPIOLIB

	depends on SND_SOC_TEGRA && I2C && GPIOLIB

	select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC

	select SND_SOC_ALC5632

	select SND_SOC_ALC5632

	help

	help

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

	  Say Y or M here if you want to add support for SoC audio on the
@@ -122,8 +114,6 @@ config SND_SOC_TEGRA_ALC5632 
config SND_SOC_TEGRA_MAX98090

config SND_SOC_TEGRA_MAX98090

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

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

	depends on SND_SOC_TEGRA && I2C && GPIOLIB

	depends on SND_SOC_TEGRA && I2C && GPIOLIB

	select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC

	select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC

	select SND_SOC_MAX98090

	select SND_SOC_MAX98090

	help

	help

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

	  Say Y or M here if you want to add support for SoC audio on Tegra
@@ -132,8 +122,6 @@ config SND_SOC_TEGRA_MAX98090 
config SND_SOC_TEGRA_RT5677

config SND_SOC_TEGRA_RT5677

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

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

	depends on SND_SOC_TEGRA && I2C && GPIOLIB

	depends on SND_SOC_TEGRA && I2C && GPIOLIB

	select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC

	select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC

	select SND_SOC_RT5677

	select SND_SOC_RT5677

	help

	help

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

	  Say Y or M here if you want to add support for SoC audio on Tegra
@@ -142,8 +130,6 @@ config SND_SOC_TEGRA_RT5677 
config SND_SOC_TEGRA_SGTL5000

config SND_SOC_TEGRA_SGTL5000

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

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

	depends on SND_SOC_TEGRA && I2C && GPIOLIB

	depends on SND_SOC_TEGRA && I2C && GPIOLIB

	select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC

	select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC

	select SND_SOC_SGTL5000

	select SND_SOC_SGTL5000

	help

	help

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

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