ASoC: fsl-esai: Revert .xlate_tdm_slot_mask() support (769091ee) · Commits · 戴 / test

This reverts commit . fsl_asoc_xlate_tdm_slot_mask() is different with snd_soc_xlate_tdm_slot_mask(). fsl_asoc_xlate_tdm_slot_mask() will set the enabled bit to 0, disabled bit to 1. snd_soc_xlate_tdm_slot_mask() will set the enabled bit to 1, disabled bit to 0. For esai when the bit value is 1, the slot is enabled, when the bit value is 0, the slot is disabled. If using fsl_asoc_xlate_tdm_slot_mask(), the esai will work abnormally. So revert this patch, make the esai use default function. Signed-off-by:

Shengjiu Wang <shengjiu.wang@freescale.com> Acked-by:

Nicolin Chen <nicoleotsuka@gmail.com> Signed-off-by:

Mark Brown <broonie@linaro.org>

sound/soc/fsl/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,6 @@ config SND_SOC_FSL_ESAI
		tristate "Enhanced Serial Audio Interface (ESAI) module support"
		select REGMAP_MMIO
		select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n
		select SND_SOC_FSL_UTILS
		help
		Say Y if you want to add Enhanced Synchronous Audio Interface
		(ESAI) support for the Freescale CPUs.

sound/soc/fsl/fsl_esai.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@

		#include "fsl_esai.h"
		#include "imx-pcm.h"
		#include "fsl_utils.h"

		#define FSL_ESAI_RATES SNDRV_PCM_RATE_8000_192000
		#define FSL_ESAI_FORMATS (SNDRV_PCM_FMTBIT_S8 \| \
		@@ -607,7 +606,6 @@ static struct snd_soc_dai_ops fsl_esai_dai_ops = {
		.hw_params = fsl_esai_hw_params,
		.set_sysclk = fsl_esai_set_dai_sysclk,
		.set_fmt = fsl_esai_set_dai_fmt,
		.xlate_tdm_slot_mask = fsl_asoc_xlate_tdm_slot_mask,
		.set_tdm_slot = fsl_esai_set_dai_tdm_slot,
		};

Admin message