diff options
| author | Adrian Alonso <aalonso@freescale.com> | 2012-04-09 12:16:53 -0500 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-07-20 13:36:03 +0800 |
| commit | 07e27e35594ce48d2da5ef0d53926236640ad5ac (patch) | |
| tree | 65baab7f8245a11b46e91f4b92974de385b7697e /sound | |
| parent | 29647996d8534edfb82cbb6f3b01000a0805f3ce (diff) | |
ENGR00179226: imx-esai remove tx personal reset during record
* Remove transmitter personal reset during stream record
this could potencially block concurrent play/record support.
* Remove receiver personal reset calls, rx is always
operational.
Signed-off-by: Adrian Alonso <aalonso@freescale.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/imx/imx-esai.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sound/soc/imx/imx-esai.c b/sound/soc/imx/imx-esai.c index 22edbf949763..5f95ecce842e 100644 --- a/sound/soc/imx/imx-esai.c +++ b/sound/soc/imx/imx-esai.c @@ -284,12 +284,10 @@ static int imx_esai_startup(struct snd_pcm_substream *substream, writel(ESAI_GPIO_ESAI, esai->base + ESAI_PCRC); } - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) local_esai->imx_esai_txrx_state |= IMX_DAI_ESAI_TX; - } else { + else local_esai->imx_esai_txrx_state |= IMX_DAI_ESAI_RX; - writel(ESAI_RCR_RPR, esai->base + ESAI_RCR); - } ESAI_DUMP(); return 0; @@ -446,7 +444,6 @@ static int imx_esai_trigger(struct snd_pcm_substream *substream, int cmd, { struct imx_esai *esai = snd_soc_dai_get_drvdata(cpu_dai); u32 reg, tfcr = 0, rfcr = 0; - u32 temp; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { tfcr = readl(esai->base + ESAI_TFCR); @@ -465,12 +462,8 @@ static int imx_esai_trigger(struct snd_pcm_substream *substream, int cmd, reg |= ESAI_TCR_TE(substream->runtime->channels); writel(reg, esai->base + ESAI_TCR); } else { - temp = readl(esai->base + ESAI_TCR); - temp &= ~ESAI_TCR_TPR; - writel(temp, esai->base + ESAI_TCR); rfcr |= ESAI_RFCR_RFEN; writel(rfcr, esai->base + ESAI_RFCR); - reg &= ~ESAI_RCR_RPR; reg |= ESAI_RCR_RE(substream->runtime->channels); writel(reg, esai->base + ESAI_RCR); } @@ -481,7 +474,6 @@ static int imx_esai_trigger(struct snd_pcm_substream *substream, int cmd, if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { reg &= ~ESAI_TCR_TE(substream->runtime->channels); writel(reg, esai->base + ESAI_TCR); - writel(reg, esai->base + ESAI_TCR); tfcr |= ESAI_TFCR_TFR; tfcr &= ~ESAI_TFCR_TFEN; writel(tfcr, esai->base + ESAI_TFCR); @@ -490,8 +482,6 @@ static int imx_esai_trigger(struct snd_pcm_substream *substream, int cmd, } else { reg &= ~ESAI_RCR_RE(substream->runtime->channels); writel(reg, esai->base + ESAI_RCR); - reg |= ESAI_RCR_RPR; - writel(reg, esai->base + ESAI_RCR); rfcr |= ESAI_RFCR_RFR; rfcr &= ~ESAI_RFCR_RFEN; writel(rfcr, esai->base + ESAI_RFCR); |