diff options
author | Xiubo Li <Li.Xiubo@freescale.com> | 2014-03-21 02:17:15 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-25 09:06:43 -0400 |
commit | 5f9e6ff66f49d4d791af2b7c9d20727fb8a688e8 (patch) | |
tree | 3e24002cb493758b2f117e377db275d34004c76e /sound | |
parent | a603c8ee526f5ea9ad9b40710308766299ad8a69 (diff) |
ASoC: imx-ssi: Add .xlate_tdm_slot_mask() support.
This patch add .xlate_tdm_slot_mask support for IMX SSI, 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>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/fsl/Kconfig | 1 | ||||
-rw-r--r-- | sound/soc/fsl/imx-ssi.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 789bc4dd5f4f..338a91642471 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig | |||
@@ -121,6 +121,7 @@ if SND_IMX_SOC | |||
121 | 121 | ||
122 | config SND_SOC_IMX_SSI | 122 | config SND_SOC_IMX_SSI |
123 | tristate | 123 | tristate |
124 | select SND_SOC_FSL_UTILS | ||
124 | 125 | ||
125 | config SND_SOC_IMX_PCM_FIQ | 126 | config SND_SOC_IMX_PCM_FIQ |
126 | tristate | 127 | tristate |
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c index df552fa1aa65..ab2fdd76b693 100644 --- a/sound/soc/fsl/imx-ssi.c +++ b/sound/soc/fsl/imx-ssi.c | |||
@@ -50,6 +50,7 @@ | |||
50 | #include <linux/platform_data/asoc-imx-ssi.h> | 50 | #include <linux/platform_data/asoc-imx-ssi.h> |
51 | 51 | ||
52 | #include "imx-ssi.h" | 52 | #include "imx-ssi.h" |
53 | #include "fsl_utils.h" | ||
53 | 54 | ||
54 | #define SSI_SACNT_DEFAULT (SSI_SACNT_AC97EN | SSI_SACNT_FV) | 55 | #define SSI_SACNT_DEFAULT (SSI_SACNT_AC97EN | SSI_SACNT_FV) |
55 | 56 | ||
@@ -339,6 +340,7 @@ static const struct snd_soc_dai_ops imx_ssi_pcm_dai_ops = { | |||
339 | .set_fmt = imx_ssi_set_dai_fmt, | 340 | .set_fmt = imx_ssi_set_dai_fmt, |
340 | .set_clkdiv = imx_ssi_set_dai_clkdiv, | 341 | .set_clkdiv = imx_ssi_set_dai_clkdiv, |
341 | .set_sysclk = imx_ssi_set_dai_sysclk, | 342 | .set_sysclk = imx_ssi_set_dai_sysclk, |
343 | .xlate_tdm_slot_mask = fsl_asoc_xlate_tdm_slot_mask, | ||
342 | .set_tdm_slot = imx_ssi_set_dai_tdm_slot, | 344 | .set_tdm_slot = imx_ssi_set_dai_tdm_slot, |
343 | .trigger = imx_ssi_trigger, | 345 | .trigger = imx_ssi_trigger, |
344 | }; | 346 | }; |