From: Russell King <rmk+kernel@arm.linux.org.uk> To: Mark Brown <broonie@kernel.org> Cc: Takashi Iwai <tiwai@suse.de>, alsa-devel@alsa-project.org, Liam Girdwood <lgirdwood@gmail.com>, linux-arm-kernel@lists.infradead.org, Jaroslav Kysela <perex@perex.cz> Subject: [PATCH 5/7] ASoC: kirkwood-i2s: fix pause handling some more Date: Thu, 26 Jun 2014 15:23:10 +0100 [thread overview] Message-ID: <E1X0AZy-0003iQ-EJ@rmk-PC.arm.linux.org.uk> (raw) In-Reply-To: <20140626142231.GR32514@n2100.arm.linux.org.uk> We still see the occasional timeout waiting for busy to clear. As the spec is contradictory, and we know that the current implementation doesn't work, try an alternative interpretation from the spec. This one appears to work - I have yet to find any issue with it during my testing over several months. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- sound/soc/kirkwood/kirkwood-i2s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index b601ad680d7b..e98650c01eba 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -238,7 +238,7 @@ static int kirkwood_i2s_play_trigger(struct snd_pcm_substream *substream, uint32_t ctl, value; ctl = readl(priv->io + KIRKWOOD_PLAYCTL); - if (ctl & KIRKWOOD_PLAYCTL_PAUSE) { + if ((ctl & KIRKWOOD_PLAYCTL_ENABLE_MASK) == 0) { unsigned timeout = 5000; /* * The Armada510 spec says that if we enter pause mode, the -- 1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: rmk+kernel@arm.linux.org.uk (Russell King) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/7] ASoC: kirkwood-i2s: fix pause handling some more Date: Thu, 26 Jun 2014 15:23:10 +0100 [thread overview] Message-ID: <E1X0AZy-0003iQ-EJ@rmk-PC.arm.linux.org.uk> (raw) In-Reply-To: <20140626142231.GR32514@n2100.arm.linux.org.uk> We still see the occasional timeout waiting for busy to clear. As the spec is contradictory, and we know that the current implementation doesn't work, try an alternative interpretation from the spec. This one appears to work - I have yet to find any issue with it during my testing over several months. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- sound/soc/kirkwood/kirkwood-i2s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index b601ad680d7b..e98650c01eba 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -238,7 +238,7 @@ static int kirkwood_i2s_play_trigger(struct snd_pcm_substream *substream, uint32_t ctl, value; ctl = readl(priv->io + KIRKWOOD_PLAYCTL); - if (ctl & KIRKWOOD_PLAYCTL_PAUSE) { + if ((ctl & KIRKWOOD_PLAYCTL_ENABLE_MASK) == 0) { unsigned timeout = 5000; /* * The Armada510 spec says that if we enter pause mode, the -- 1.8.3.1
next prev parent reply other threads:[~2014-06-26 14:23 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-06-26 14:22 [PATCH 0/7] Kirkwood ASoC updates Russell King - ARM Linux 2014-06-26 14:22 ` Russell King - ARM Linux 2014-06-26 14:22 ` [PATCH 1/7] ASoC: fix debugfs directory creation bug Russell King 2014-06-26 14:22 ` Russell King 2014-06-27 2:45 ` Lars-Peter Clausen 2014-06-27 2:45 ` [alsa-devel] " Lars-Peter Clausen 2014-06-28 12:46 ` Mark Brown 2014-06-28 12:46 ` [alsa-devel] " Mark Brown 2014-06-26 14:22 ` [PATCH 2/7] ASoC: kirkwood-i2s: provide helper KIRKWOOD_RECCTL_ENABLE_MASK definition Russell King 2014-06-26 14:22 ` Russell King 2014-06-26 14:23 ` [PATCH 3/7] ASoC: kirkwood-i2s: fix RECCTL masking Russell King 2014-06-26 14:23 ` Russell King 2014-06-26 14:23 ` [PATCH 4/7] ASoC: kirkwood-i2s: fix mute handling Russell King 2014-06-26 14:23 ` Russell King 2014-06-26 14:23 ` Russell King [this message] 2014-06-26 14:23 ` [PATCH 5/7] ASoC: kirkwood-i2s: fix pause handling some more Russell King 2014-06-26 14:23 ` [PATCH 6/7] ASoC: kirkwood: allow smaller audio periods and smaller number of periods Russell King 2014-06-26 14:23 ` Russell King 2014-06-26 14:23 ` [PATCH 7/7] ASoC: kirkwood: implement NO_PERIOD_WAKEUP support Russell King 2014-06-26 14:23 ` Russell King 2014-06-26 18:10 ` [PATCH 0/7] Kirkwood ASoC updates Andrew Lunn 2014-06-26 18:10 ` Andrew Lunn 2014-06-26 18:22 ` Russell King - ARM Linux 2014-06-26 18:22 ` Russell King - ARM Linux 2014-06-28 12:47 ` Mark Brown 2014-06-28 12:47 ` 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=E1X0AZy-0003iQ-EJ@rmk-PC.arm.linux.org.uk \ --to=rmk+kernel@arm.linux.org.uk \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=lgirdwood@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=perex@perex.cz \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.