From: Mark Brown <broonie@kernel.org>
To: Jerome Brunet <jbrunet@baylibre.com>
Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org,
Kevin Hilman <khilman@baylibre.com>,
Liam Girdwood <lgirdwood@gmail.com>,
linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org,
Mark Brown <broonie@kernel.org>
Subject: Applied "ASoC: meson: axg-tdm: fix sample clock inversion" to the asoc tree
Date: Thu, 13 Jun 2019 20:06:11 +0100 (BST) [thread overview]
Message-ID: <20190613190611.3AA0B440046@finisterre.sirena.org.uk> (raw)
In-Reply-To: <20190613114233.21130-4-jbrunet@baylibre.com>
The patch
ASoC: meson: axg-tdm: fix sample clock inversion
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.2
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
From cb36ff785e868992e96e8b9e5a0c2822b680a9e2 Mon Sep 17 00:00:00 2001
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Thu, 13 Jun 2019 13:42:32 +0200
Subject: [PATCH] ASoC: meson: axg-tdm: fix sample clock inversion
The content of SND_SOC_DAIFMT_FORMAT_MASK is a number, not a bitfield,
so the test to check if the format is i2s is wrong. Because of this the
clock setting may be wrong. For example, the sample clock gets inverted
in DSP B mode, when it should not.
Fix the lrclk invert helper function
Fixes: 1a11d88f499c ("ASoC: meson: add tdm formatter base driver")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/meson/axg-tdm.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/meson/axg-tdm.h b/sound/soc/meson/axg-tdm.h
index e578b6f40a07..5774ce0916d4 100644
--- a/sound/soc/meson/axg-tdm.h
+++ b/sound/soc/meson/axg-tdm.h
@@ -40,7 +40,7 @@ struct axg_tdm_iface {
static inline bool axg_tdm_lrclk_invert(unsigned int fmt)
{
- return (fmt & SND_SOC_DAIFMT_I2S) ^
+ return ((fmt & SND_SOC_DAIFMT_FORMAT_MASK) == SND_SOC_DAIFMT_I2S) ^
!!(fmt & (SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_NB_IF));
}
--
2.20.1
next prev parent reply other threads:[~2019-06-13 19:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-13 11:42 [PATCH 0/4] ASoC: meson: axg-tdm: i2s format fixups Jerome Brunet
2019-06-13 11:42 ` [PATCH 1/4] ASoC: meson: axg-tdmin: right_j is not supported Jerome Brunet
2019-06-13 19:06 ` Applied "ASoC: meson: axg-tdmin: right_j is not supported" to the asoc tree Mark Brown
2019-06-13 11:42 ` [PATCH 2/4] ASoC: meson: axg-tdmout: right_j is not supported Jerome Brunet
2019-06-13 19:06 ` Applied "ASoC: meson: axg-tdmout: right_j is not supported" to the asoc tree Mark Brown
2019-06-13 11:42 ` [PATCH 3/4] ASoC: meson: axg-tdm: fix sample clock inversion Jerome Brunet
2019-06-13 19:06 ` Mark Brown [this message]
2019-06-13 11:42 ` [PATCH 4/4] ASoC: meson: axg-tdm: consistently use SND_SOC_DAIFMT defines Jerome Brunet
2019-06-13 19:06 ` Applied "ASoC: meson: axg-tdm: consistently use SND_SOC_DAIFMT defines" to the asoc tree 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=20190613190611.3AA0B440046@finisterre.sirena.org.uk \
--to=broonie@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=devicetree@vger.kernel.org \
--cc=jbrunet@baylibre.com \
--cc=khilman@baylibre.com \
--cc=lgirdwood@gmail.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).