From 55d40a92e7b4fe3100e3a39501e4bc7d91114569 Mon Sep 17 00:00:00 2001 From: Arun Shamanna Lakshmi Date: Fri, 12 Dec 2014 18:23:27 -0800 Subject: [PATCH] ASoC: tegra-alt: Fix ADMAIF codec dai id 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 Reviewed-on: http://git-master/r/663554 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Justin Kim (SW-TEGRA) Reviewed-by: Dara Ramesh --- sound/soc/tegra-alt/tegra210_admaif_alt.c | 36 +++++++++++++++-------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/sound/soc/tegra-alt/tegra210_admaif_alt.c b/sound/soc/tegra-alt/tegra210_admaif_alt.c index 87e3709b..dbc71ce2 100644 --- a/sound/soc/tegra-alt/tegra210_admaif_alt.c +++ b/sound/soc/tegra-alt/tegra210_admaif_alt.c @@ -503,7 +503,7 @@ static struct snd_soc_dai_driver tegra210_admaif_dais[10] = { ADMAIF_DAI(10), }; -#define ADMAIF_CODEC_DAI(id) \ +#define ADMAIF_CODEC_FIFO_DAI(id) \ { \ .name = "ADMAIF" #id " FIFO", \ .playback = { \ @@ -521,7 +521,9 @@ static struct snd_soc_dai_driver tegra210_admaif_dais[10] = { .formats = SNDRV_PCM_FMTBIT_S16_LE, \ }, \ .ops = &tegra210_admaif_dai_ops, \ - }, \ + } + +#define ADMAIF_CODEC_CIF_DAI(id) \ { \ .name = "ADMAIF" #id " CIF", \ .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[] = { - ADMAIF_CODEC_DAI(1), - ADMAIF_CODEC_DAI(2), - ADMAIF_CODEC_DAI(3), - ADMAIF_CODEC_DAI(4), - ADMAIF_CODEC_DAI(5), - ADMAIF_CODEC_DAI(6), - ADMAIF_CODEC_DAI(7), - ADMAIF_CODEC_DAI(8), - ADMAIF_CODEC_DAI(9), - ADMAIF_CODEC_DAI(10), + ADMAIF_CODEC_FIFO_DAI(1), + ADMAIF_CODEC_FIFO_DAI(2), + ADMAIF_CODEC_FIFO_DAI(3), + ADMAIF_CODEC_FIFO_DAI(4), + ADMAIF_CODEC_FIFO_DAI(5), + ADMAIF_CODEC_FIFO_DAI(6), + ADMAIF_CODEC_FIFO_DAI(7), + ADMAIF_CODEC_FIFO_DAI(8), + ADMAIF_CODEC_FIFO_DAI(9), + 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) \