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: Stephen Warren <swarren@nvidia.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig
index 9e53fec52d60d13f3b9930ad269199b4f1484f4d..21125b3026303ef202bbfa441064b9e7e6a30311 100644 (file)
--- a/sound/soc/tegra/Kconfig
+++ b/sound/soc/tegra/Kconfig
@@ -1,24 +1,24 @@
-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

diff --git a/sound/soc/tegra/Makefile b/sound/soc/tegra/Makefile
index c9f7ea4303767453c290466e71556b9983a099b3..13bef8d572c9434743610c8a50c9c102e807748a 100644 (file)
--- a/sound/soc/tegra/Makefile
+++ b/sound/soc/tegra/Makefile
@@ -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