aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiubo Li <Li.Xiubo@freescale.com>2014-03-21 02:17:14 -0400
committerMark Brown <broonie@linaro.org>2014-03-25 09:06:43 -0400
commita603c8ee526f5ea9ad9b40710308766299ad8a69 (patch)
tree7cd900ebcc2485254ba501bf503307499b9e5658
parent82535314a942c1235d54a0cdbe48d38f640d56ba (diff)
ASoC: fsl-esai: Add .xlate_tdm_slot_mask() support.
This patch add .xlate_tdm_slot_mask support for ESAI, and this will generate the TDM slot TX and RX masks. Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/fsl/Kconfig1
-rw-r--r--sound/soc/fsl/fsl_esai.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 597962ec28fa..789bc4dd5f4f 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -13,6 +13,7 @@ config SND_SOC_FSL_SPDIF
13config SND_SOC_FSL_ESAI 13config SND_SOC_FSL_ESAI
14 tristate 14 tristate
15 select REGMAP_MMIO 15 select REGMAP_MMIO
16 select SND_SOC_FSL_UTILS
16 17
17config SND_SOC_FSL_UTILS 18config SND_SOC_FSL_UTILS
18 tristate 19 tristate
diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index 0ba37005ab04..c8e5db1414d7 100644
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@ -18,6 +18,7 @@
18 18
19#include "fsl_esai.h" 19#include "fsl_esai.h"
20#include "imx-pcm.h" 20#include "imx-pcm.h"
21#include "fsl_utils.h"
21 22
22#define FSL_ESAI_RATES SNDRV_PCM_RATE_8000_192000 23#define FSL_ESAI_RATES SNDRV_PCM_RATE_8000_192000
23#define FSL_ESAI_FORMATS (SNDRV_PCM_FMTBIT_S8 | \ 24#define FSL_ESAI_FORMATS (SNDRV_PCM_FMTBIT_S8 | \
@@ -581,6 +582,7 @@ static struct snd_soc_dai_ops fsl_esai_dai_ops = {
581 .hw_params = fsl_esai_hw_params, 582 .hw_params = fsl_esai_hw_params,
582 .set_sysclk = fsl_esai_set_dai_sysclk, 583 .set_sysclk = fsl_esai_set_dai_sysclk,
583 .set_fmt = fsl_esai_set_dai_fmt, 584 .set_fmt = fsl_esai_set_dai_fmt,
585 .xlate_tdm_slot_mask = fsl_asoc_xlate_tdm_slot_mask,
584 .set_tdm_slot = fsl_esai_set_dai_tdm_slot, 586 .set_tdm_slot = fsl_esai_set_dai_tdm_slot,
585}; 587};
586 588