From: Andrew Jackson <andrew.jackson@arm.com>
To: Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>
Cc: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
Rajeev Kumar <rajeevkumar.linux@gmail.com>,
Andrew Jackson <Andrew.Jackson@arm.com>,
Liviu Dudau <Liviu.Dudau@arm.com>,
Lars-Peter Clausen <lars@metafoo.de>,
Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org,
alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 1/5] ASoC: dwc: Ensure FIFOs are flushed to prevent channel swap
Date: Fri, 19 Dec 2014 16:18:05 +0000 [thread overview]
Message-ID: <8f40608d5665e80bfd3e9723784ec3bc2078e0d2.1418826016.git.Andrew.Jackson@arm.com> (raw)
In-Reply-To: <cover.1418826016.git.Andrew.Jackson@arm.com>
In-Reply-To: <cover.1418826016.git.Andrew.Jackson@arm.com>
From: Andrew Jackson <Andrew.Jackson@arm.com>
Flush the FIFOs when the stream is prepared for use. This avoids
an inadvertent swapping of the left/right channels if the FIFOs are
not empty at startup.
Signed-off-by: Andrew Jackson <Andrew.Jackson@arm.com>
---
sound/soc/dwc/designware_i2s.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c
index f81e747..5c13303 100644
--- a/sound/soc/dwc/designware_i2s.c
+++ b/sound/soc/dwc/designware_i2s.c
@@ -263,6 +263,19 @@ static void dw_i2s_shutdown(struct snd_pcm_substream *substream,
snd_soc_dai_set_dma_data(dai, substream, NULL);
}
+static int dw_i2s_prepare(struct snd_pcm_substream *substream,
+ struct snd_soc_dai *dai)
+{
+ struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);
+
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ i2s_write_reg(dev->i2s_base, TXFFR, 1);
+ else
+ i2s_write_reg(dev->i2s_base, RXFFR, 1);
+
+ return 0;
+}
+
static int dw_i2s_trigger(struct snd_pcm_substream *substream,
int cmd, struct snd_soc_dai *dai)
{
@@ -294,6 +307,7 @@ static struct snd_soc_dai_ops dw_i2s_dai_ops = {
.startup = dw_i2s_startup,
.shutdown = dw_i2s_shutdown,
.hw_params = dw_i2s_hw_params,
+ .prepare = dw_i2s_prepare,
.trigger = dw_i2s_trigger,
};
--
1.7.1
next prev parent reply other threads:[~2014-12-19 16:19 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-19 16:18 [PATCH v3 0/5] ASoC: dwc: Add device tree support to designware I2S Andrew Jackson
2014-12-19 16:18 ` Andrew Jackson [this message]
2014-12-22 13:45 ` [PATCH v3 1/5] ASoC: dwc: Ensure FIFOs are flushed to prevent channel swap Mark Brown
2014-12-19 16:18 ` [PATCH v3 2/5] ASoC: dwc: Iterate over all channels Andrew Jackson
2014-12-22 13:53 ` Mark Brown
2014-12-22 14:08 ` Andrew Jackson
2014-12-22 15:06 ` Mark Brown
2014-12-19 16:18 ` [PATCH v3 3/5] ASoC: dwc: Reorder code in preparation for DT support Andrew Jackson
2014-12-22 14:00 ` Mark Brown
2014-12-19 16:18 ` [PATCH v3 4/5] ASoC: dwc: Add devicetree support for Designware I2S Andrew Jackson
2014-12-22 14:10 ` Mark Brown
2014-12-22 15:58 ` Andrew Jackson
2014-12-22 14:28 ` Mark Brown
2014-12-19 16:18 ` [PATCH v3 5/5] ASoC: dwc: Add documentation for I2S DT Andrew Jackson
2014-12-22 14:26 ` Mark Brown
2014-12-22 15:51 ` Andrew Jackson
2014-12-22 16:51 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8f40608d5665e80bfd3e9723784ec3bc2078e0d2.1418826016.git.Andrew.Jackson@arm.com \
--to=andrew.jackson@arm.com \
--cc=Liviu.Dudau@arm.com \
--cc=alsa-devel@alsa-project.org \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=lars@metafoo.de \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=rajeevkumar.linux@gmail.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®