aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiubo Li <Li.Xiubo@freescale.com>2013-12-31 02:33:22 -0500
committerMark Brown <broonie@linaro.org>2013-12-31 07:23:10 -0500
commit72aa62bed3ea30635156fad95f123a0b665072bf (patch)
tree89dc0eadbb521c17229d3fd0899c584ed7586e99
parent496a39d9ec238569fac6daceac8f5420c5edc2f1 (diff)
ASoC: fsl_sai: fix the endianess for SAI fifo data.
Revert the SAI's endianess for fifo data to/from DMA engine. Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/fsl/fsl_sai.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index 2ece14716c67..5d38a6749b9f 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -138,9 +138,9 @@ static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai *cpu_dai,
138 val_cr4 = sai_readl(sai, sai->base + reg_cr4); 138 val_cr4 = sai_readl(sai, sai->base + reg_cr4);
139 139
140 if (sai->big_endian_data) 140 if (sai->big_endian_data)
141 val_cr4 |= FSL_SAI_CR4_MF;
142 else
143 val_cr4 &= ~FSL_SAI_CR4_MF; 141 val_cr4 &= ~FSL_SAI_CR4_MF;
142 else
143 val_cr4 |= FSL_SAI_CR4_MF;
144 144
145 switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { 145 switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
146 case SND_SOC_DAIFMT_I2S: 146 case SND_SOC_DAIFMT_I2S:
@@ -251,9 +251,9 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream,
251 251
252 val_cr5 &= ~FSL_SAI_CR5_FBT_MASK; 252 val_cr5 &= ~FSL_SAI_CR5_FBT_MASK;
253 if (sai->big_endian_data) 253 if (sai->big_endian_data)
254 val_cr5 |= FSL_SAI_CR5_FBT(word_width - 1);
255 else
256 val_cr5 |= FSL_SAI_CR5_FBT(0); 254 val_cr5 |= FSL_SAI_CR5_FBT(0);
255 else
256 val_cr5 |= FSL_SAI_CR5_FBT(word_width - 1);
257 257
258 val_cr4 |= FSL_SAI_CR4_FRSZ(channels); 258 val_cr4 |= FSL_SAI_CR4_FRSZ(channels);
259 val_mr = ~0UL - ((1 << channels) - 1); 259 val_mr = ~0UL - ((1 << channels) - 1);