summaryrefslogtreecommitdiff
path: root/sound/soc/tegra
diff options
context:
space:
mode:
authorVinod G <vinodg@nvidia.com>2011-09-19 10:57:23 -0700
committerRohan Somvanshi <rsomvanshi@nvidia.com>2011-09-20 06:02:55 -0700
commit106fb08aa882d53999fec66ba9eeaab2f30af0ca (patch)
treeaaa033615d392d0bc4998c2345dac38eb57778e1 /sound/soc/tegra
parent6be4ec9c40e6422b015ad92de67fb9488ccfcd48 (diff)
arm: tegra: asoc: Adding aic3262 codec drivertegra-10.11.16
Adding the codec driver for aic3262 codec bug 816608 Change-Id: I31ebb5e34e1b4f8bcef7db7c20163f6f44d2e783 Reviewed-on: http://git-master/r/53254 Reviewed-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com> Tested-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com> Reviewed-by: Scott Peterson <speterson@nvidia.com>
Diffstat (limited to 'sound/soc/tegra')
-rw-r--r--sound/soc/tegra/Makefile2
-rw-r--r--sound/soc/tegra/tegra_soc_aic326x.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/tegra/Makefile b/sound/soc/tegra/Makefile
index 41ee945438d5..0018390d03f1 100644
--- a/sound/soc/tegra/Makefile
+++ b/sound/soc/tegra/Makefile
@@ -7,4 +7,4 @@ obj-$(CONFIG_TEGRA_ALSA) += tegra_soc_controls.o
obj-$(CONFIG_TEGRA_GENERIC_CODEC)+= tegra_generic_codec.o
obj-${CONFIG_SND_SOC_WM8903} += tegra_soc_wm8903.o
obj-${CONFIG_SND_SOC_WM8753} += tegra_soc_wm8753.o
-obj-${CONFIG_SND_SOC_TLV320AIC326X} += tegra_soc_aic326x.o
+#obj-${CONFIG_SND_SOC_TLV320AIC326X} += tegra_soc_aic326x.o
diff --git a/sound/soc/tegra/tegra_soc_aic326x.c b/sound/soc/tegra/tegra_soc_aic326x.c
index 7d486c44b8b8..dc7789e4c2a8 100644
--- a/sound/soc/tegra/tegra_soc_aic326x.c
+++ b/sound/soc/tegra/tegra_soc_aic326x.c
@@ -247,8 +247,8 @@ static const struct snd_soc_dapm_route aic326x_audio_map[] = {
{"IN2R", NULL, "Ext Mic"},
/* Line in */
- {"RECL", NULL, "Linein"},
- {"RECR", NULL, "Linein"},
+ {"IN2L", NULL, "Linein"},
+ {"IN2R", NULL, "Linein"},
};
#if 0