nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: tegra-alt: Fix ADMAIF codec dai id

Browse Source 
Register FIFO dais before CIF dais to retreive corrrect DAI ids
in the hw_params.

Bug 1587869

Change-Id: I498a82fed6e30aab9949a42b34ab7cf781552ea3
Signed-off-by: Arun Shamanna Lakshmi <aruns@nvidia.com>
Reviewed-on: http://git-master/r/663554
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Justin Kim (SW-TEGRA) <juskim@nvidia.com>
Reviewed-by: Dara Ramesh <dramesh@nvidia.com>
This commit is contained in:
Arun Shamanna Lakshmi
2014-12-12 18:23:27 -08:00
committed by Sameer Pujar
parent 906ab7661c
commit 55d40a92e7
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
sound/soc/tegra-alt/tegra210_admaif_alt.c
View File

@@ -503,7 +503,7 @@ static struct snd_soc_dai_driver tegra210_admaif_dais[10] = {
ADMAIF_DAI(10), ADMAIF_DAI(10),
}; };
#define ADMAIF_CODEC_DAI(id) \ #define ADMAIF_CODEC_FIFO_DAI(id) \
{ \ { \
.name = "ADMAIF" #id " FIFO", \ .name = "ADMAIF" #id " FIFO", \
.playback = { \ .playback = { \
@@ -521,7 +521,9 @@ static struct snd_soc_dai_driver tegra210_admaif_dais[10] = {
.formats = SNDRV_PCM_FMTBIT_S16_LE, \ .formats = SNDRV_PCM_FMTBIT_S16_LE, \
}, \ }, \
.ops = &tegra210_admaif_dai_ops, \ .ops = &tegra210_admaif_dai_ops, \
}, \ }
#define ADMAIF_CODEC_CIF_DAI(id) \
{ \ { \
.name = "ADMAIF" #id " CIF", \ .name = "ADMAIF" #id " CIF", \
.playback = { \ .playback = { \
@@ -541,16 +543,26 @@ static struct snd_soc_dai_driver tegra210_admaif_dais[10] = {
} }
static struct snd_soc_dai_driver tegra210_admaif_codec_dais[] = { static struct snd_soc_dai_driver tegra210_admaif_codec_dais[] = {
ADMAIF_CODEC_DAI(1), ADMAIF_CODEC_FIFO_DAI(1),
ADMAIF_CODEC_DAI(2), ADMAIF_CODEC_FIFO_DAI(2),
ADMAIF_CODEC_DAI(3), ADMAIF_CODEC_FIFO_DAI(3),
ADMAIF_CODEC_DAI(4), ADMAIF_CODEC_FIFO_DAI(4),
ADMAIF_CODEC_DAI(5), ADMAIF_CODEC_FIFO_DAI(5),
ADMAIF_CODEC_DAI(6), ADMAIF_CODEC_FIFO_DAI(6),
ADMAIF_CODEC_DAI(7), ADMAIF_CODEC_FIFO_DAI(7),
ADMAIF_CODEC_DAI(8), ADMAIF_CODEC_FIFO_DAI(8),
ADMAIF_CODEC_DAI(9), ADMAIF_CODEC_FIFO_DAI(9),
ADMAIF_CODEC_DAI(10), ADMAIF_CODEC_FIFO_DAI(10),
ADMAIF_CODEC_CIF_DAI(1),
ADMAIF_CODEC_CIF_DAI(2),
ADMAIF_CODEC_CIF_DAI(3),
ADMAIF_CODEC_CIF_DAI(4),
ADMAIF_CODEC_CIF_DAI(5),
ADMAIF_CODEC_CIF_DAI(6),
ADMAIF_CODEC_CIF_DAI(7),
ADMAIF_CODEC_CIF_DAI(8),
ADMAIF_CODEC_CIF_DAI(9),
ADMAIF_CODEC_CIF_DAI(10),
}; };
#define ADMAIF_WIDGETS(id) \ #define ADMAIF_WIDGETS(id) \