summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTom Cherry <tcherry@nvidia.com>2011-05-26 19:43:45 -0700
committerNiket Sirsi <nsirsi@nvidia.com>2011-06-01 12:00:28 -0700
commita2287a12ac5fbfe1f7ef92c0825726e2cbe04b1a (patch)
treecbf07b8bff08d00c0fa13bc4afe4acc294d4de37 /sound
parent360249a59fcd43d62752d2333c8de06af3edb0f8 (diff)
sound: soc: tegra: add dai for i2s_device0
Change-Id: Ib0662de97f4f98461f1003747340bb9e16f96ebb Reviewed-on: http://git-master/r/34258 Tested-by: Ravindra Lokhande <rlokhande@nvidia.com> Reviewed-by: Ravindra Lokhande <rlokhande@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Thomas Cherry <tcherry@nvidia.com> Tested-by: Thomas Cherry <tcherry@nvidia.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/tegra/tegra_i2s.c1
-rw-r--r--sound/soc/tegra/tegra_soc_wm8903.c10
2 files changed, 8 insertions, 3 deletions
diff --git a/sound/soc/tegra/tegra_i2s.c b/sound/soc/tegra/tegra_i2s.c
index 840a2138533c..e909359fbdc0 100644
--- a/sound/soc/tegra/tegra_i2s.c
+++ b/sound/soc/tegra/tegra_i2s.c
@@ -413,6 +413,7 @@ struct snd_soc_dai tegra_i2s_dai[] = {
TEGRA_I2S_CREATE_DAI(0, 1, 2, TEGRA_SAMPLE_RATES),
TEGRA_I2S_CREATE_DAI(1, 1, 2, TEGRA_SAMPLE_RATES),
#else
+ TEGRA_I2S_CREATE_DAI(0, 2, 2, TEGRA_SAMPLE_RATES),
TEGRA_I2S_CREATE_DAI(1, 2, 2, TEGRA_SAMPLE_RATES),
TEGRA_I2S_CREATE_DAI(2, 1, 2, TEGRA_VOICE_SAMPLE_RATES),
TEGRA_I2S_CREATE_DAI(3, 1, 2, TEGRA_VOICE_SAMPLE_RATES),
diff --git a/sound/soc/tegra/tegra_soc_wm8903.c b/sound/soc/tegra/tegra_soc_wm8903.c
index c73ab053b8b1..f871a814e339 100644
--- a/sound/soc/tegra/tegra_soc_wm8903.c
+++ b/sound/soc/tegra/tegra_soc_wm8903.c
@@ -544,19 +544,23 @@ wm8903_init_fail:
}
static struct snd_soc_dai_link tegra_soc_dai[] = {
+#if defined(CONFIG_ARCH_TEGRA_2x_SOC)
TEGRA_CREATE_SOC_DAI_LINK("WM8903", "WM8903 HiFi",
&tegra_i2s_dai[0], &wm8903_dai, &tegra_hifi_ops),
-#if defined(CONFIG_ARCH_TEGRA_2x_SOC)
TEGRA_CREATE_SOC_DAI_LINK("Tegra-generic", "Tegra Generic Voice",
&tegra_i2s_dai[1], &tegra_generic_codec_dai[1],
&tegra_voice_ops),
#else
+ TEGRA_CREATE_SOC_DAI_LINK("WM8903", "WM8903 HiFi",
+ &tegra_i2s_dai[1], &wm8903_dai, &tegra_hifi_ops),
+
TEGRA_CREATE_SOC_DAI_LINK("Tegra-generic-0", "Tegra BB Voice",
- &tegra_i2s_dai[1], &tegra_generic_codec_dai[1],
+ &tegra_i2s_dai[2], &tegra_generic_codec_dai[1],
&tegra_voice_ops),
+
TEGRA_CREATE_SOC_DAI_LINK("Tegra-generic-1", "Tegra BT Voice",
- &tegra_i2s_dai[2], &tegra_generic_codec_dai[2],
+ &tegra_i2s_dai[3], &tegra_generic_codec_dai[2],
&tegra_voice_ops),
#endif