summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorAlison Wang <b18965@freescale.com>2015-04-29 08:25:58 (GMT)
committerZhengxiong Jin <Jason.Jin@freescale.com>2015-05-19 02:31:02 (GMT)
commitbebea77d2ccb1a0b55041c5047b4c92967bdb692 (patch)
treee46761d1fa0a3d4201b2ca21770318eeb80463af /sound/soc
parenta449b2225c678c5723d83845df6e62a18360282a (diff)
downloadlinux-fsl-qoriq-bebea77d2ccb1a0b55041c5047b4c92967bdb692.tar.xz
Revert "ls102xa: audio: Workaround for SAI data transfer endian issue"
This reverts commit <f911217e6edd> (ls102xa: audio: Workaround for SAI data transfer endian issue). The patch "ls102xa: audio: Workaround for SAI data transfer endian issue" isn't needed for LS1021A Rev2.0 silicon. Signed-off-by: Alison Wang <alison.wang@freescale.com> Change-Id: I850e4207e7beb7eedda260df001d9189ac666f28 Reviewed-on: http://git.am.freescale.net:8181/36159 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Zhengxiong Jin <Jason.Jin@freescale.com> Tested-by: Zhengxiong Jin <Jason.Jin@freescale.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/fsl/fsl_sai.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index 3653b25..896f011 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -334,9 +334,6 @@ static int fsl_sai_startup(struct snd_pcm_substream *substream,
struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
u32 reg;
- if (sai->big_endian_regs)
- substream->data_swapped = 1;
-
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
reg = FSL_SAI_TCR3;
else
@@ -555,14 +552,8 @@ static int fsl_sai_probe(struct platform_device *pdev)
return PTR_ERR(sai->regmap);
}
- if (sai->big_endian_regs) {
- sai->dma_params_rx.addr = res->start + FSL_SAI_RDR + 2;
- sai->dma_params_tx.addr = res->start + FSL_SAI_TDR + 2;
- } else {
- sai->dma_params_rx.addr = res->start + FSL_SAI_RDR;
- sai->dma_params_tx.addr = res->start + FSL_SAI_TDR;
- }
-
+ sai->dma_params_rx.addr = res->start + FSL_SAI_RDR;
+ sai->dma_params_tx.addr = res->start + FSL_SAI_TDR;
sai->dma_params_rx.maxburst = FSL_SAI_MAXBURST_RX;
sai->dma_params_tx.maxburst = FSL_SAI_MAXBURST_TX;