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

Commit 2ba9471b authored by Stephen Warren's avatar Stephen Warren Committed by Mark Brown
Browse files

ASoC: Tegra: Rename Kconfig SND_TEGRA_SOC_* to SND_SOC_TEGRA_* 



The previous commit renames SND_TEGRA_SOC_HARMONY to SND_TEGRA_SOC_WM8903.
While we're breaking people's .config files, rename all Tegra/SOC-related
Kconfig variables to be more consistent with at least the core codec
variables. Note that there exist machines that name their variables both
ways.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent dc0a50af

sound/soc/tegra/Kconfig

+6 −6
Original line number Diff line number Diff line 
config SND_TEGRA_SOC

config SND_SOC_TEGRA

	tristate "SoC Audio for the Tegra System-on-Chip"

	depends on ARCH_TEGRA && TEGRA_SYSTEM_DMA

	default m

	help

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



config SND_TEGRA_SOC_I2S

config SND_SOC_TEGRA_I2S

	tristate

	depends on SND_TEGRA_SOC

	depends on SND_SOC_TEGRA

	default m

	help

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

	  Tegra I2S interface. You will also need to select the individual

	  machine drivers to support below.



config SND_TEGRA_SOC_WM8903

config SND_SOC_TEGRA_WM8903

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

	depends on SND_TEGRA_SOC && MACH_HARMONY && I2C

	depends on SND_SOC_TEGRA && MACH_HARMONY && I2C

	default m

	select SND_TEGRA_SOC_I2S

	select SND_SOC_TEGRA_I2S

	select SND_SOC_WM8903

	help

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

sound/soc/tegra/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -4,12 +4,12 @@ snd-soc-tegra-pcm-objs := tegra_pcm.o 
snd-soc-tegra-i2s-objs := tegra_i2s.o

snd-soc-tegra-utils-objs += tegra_asoc_utils.o



obj-$(CONFIG_SND_TEGRA_SOC) += snd-soc-tegra-utils.o

obj-$(CONFIG_SND_TEGRA_SOC) += snd-soc-tegra-das.o

obj-$(CONFIG_SND_TEGRA_SOC) += snd-soc-tegra-pcm.o

obj-$(CONFIG_SND_TEGRA_SOC_I2S) += snd-soc-tegra-i2s.o

obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-utils.o

obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-das.o

obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-pcm.o

obj-$(CONFIG_SND_SOC_TEGRA_I2S) += snd-soc-tegra-i2s.o



# Tegra machine Support

snd-soc-tegra-wm8903-objs := tegra_wm8903.o



obj-$(CONFIG_SND_TEGRA_SOC_WM8903) += snd-soc-tegra-wm8903.o
 
obj-$(CONFIG_SND_SOC_TEGRA_WM8903) += snd-soc-tegra-wm8903.o