* [PATCH 0/4] ASoC: meson: axg-tdm: i2s format fixups
@ 2019-06-13 11:42 Jerome Brunet
2019-06-13 11:42 ` [PATCH 1/4] ASoC: meson: axg-tdmin: right_j is not supported Jerome Brunet
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Jerome Brunet @ 2019-06-13 11:42 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood, Kevin Hilman
Cc: devicetree, alsa-devel, linux-amlogic, linux-kernel, Jerome Brunet
The patchset fixes a few mistakes regarding the format on the i2s bus
on the Amlogic axg tdm drivers.
Jerome Brunet (4):
ASoC: meson: axg-tdmin: right_j is not supported
ASoC: meson: axg-tdmout: right_j is not supported
ASoC: meson: axg-tdm: fix sample clock inversion
ASoC: meson: axg-tdm: consistently use SND_SOC_DAIFMT defines
sound/soc/meson/axg-tdm-interface.c | 4 ++--
sound/soc/meson/axg-tdm.h | 2 +-
sound/soc/meson/axg-tdmin.c | 1 -
sound/soc/meson/axg-tdmout.c | 1 -
4 files changed, 3 insertions(+), 5 deletions(-)
--
2.20.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/4] ASoC: meson: axg-tdmin: right_j is not supported
2019-06-13 11:42 [PATCH 0/4] ASoC: meson: axg-tdm: i2s format fixups Jerome Brunet
@ 2019-06-13 11:42 ` 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
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Jerome Brunet @ 2019-06-13 11:42 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood, Kevin Hilman
Cc: devicetree, alsa-devel, linux-amlogic, linux-kernel, Jerome Brunet
Right justified format is actually not supported by the amlogic tdm input
decoder.
Fixes: 13a22e6a98f8 ("ASoC: meson: add tdm input driver")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
sound/soc/meson/axg-tdmin.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/sound/soc/meson/axg-tdmin.c b/sound/soc/meson/axg-tdmin.c
index a790f925a4ef..cb87f17f3e95 100644
--- a/sound/soc/meson/axg-tdmin.c
+++ b/sound/soc/meson/axg-tdmin.c
@@ -121,7 +121,6 @@ static int axg_tdmin_prepare(struct regmap *map,
break;
case SND_SOC_DAIFMT_LEFT_J:
- case SND_SOC_DAIFMT_RIGHT_J:
case SND_SOC_DAIFMT_DSP_B:
break;
--
2.20.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/4] ASoC: meson: axg-tdmout: right_j is not supported
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 11:42 ` 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 11:42 ` [PATCH 4/4] ASoC: meson: axg-tdm: consistently use SND_SOC_DAIFMT defines Jerome Brunet
3 siblings, 1 reply; 9+ messages in thread
From: Jerome Brunet @ 2019-06-13 11:42 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood, Kevin Hilman
Cc: devicetree, alsa-devel, linux-amlogic, linux-kernel, Jerome Brunet
Right justified format is actually not supported by the amlogic tdm output
encoder.
Fixes: c41c2a355b86 ("ASoC: meson: add tdm output driver")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
sound/soc/meson/axg-tdmout.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/sound/soc/meson/axg-tdmout.c b/sound/soc/meson/axg-tdmout.c
index 527bfc4487e0..86537fc0ecb5 100644
--- a/sound/soc/meson/axg-tdmout.c
+++ b/sound/soc/meson/axg-tdmout.c
@@ -137,7 +137,6 @@ static int axg_tdmout_prepare(struct regmap *map,
break;
case SND_SOC_DAIFMT_LEFT_J:
- case SND_SOC_DAIFMT_RIGHT_J:
case SND_SOC_DAIFMT_DSP_B:
skew += 1;
break;
--
2.20.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/4] ASoC: meson: axg-tdm: fix sample clock inversion
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 11:42 ` [PATCH 2/4] ASoC: meson: axg-tdmout: right_j is not supported Jerome Brunet
@ 2019-06-13 11:42 ` Jerome Brunet
2019-06-13 19:06 ` Applied "ASoC: meson: axg-tdm: fix sample clock inversion" to the asoc tree Mark Brown
2019-06-13 11:42 ` [PATCH 4/4] ASoC: meson: axg-tdm: consistently use SND_SOC_DAIFMT defines Jerome Brunet
3 siblings, 1 reply; 9+ messages in thread
From: Jerome Brunet @ 2019-06-13 11:42 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood, Kevin Hilman
Cc: devicetree, alsa-devel, linux-amlogic, linux-kernel, Jerome Brunet
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>
---
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
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/4] ASoC: meson: axg-tdm: consistently use SND_SOC_DAIFMT defines
2019-06-13 11:42 [PATCH 0/4] ASoC: meson: axg-tdm: i2s format fixups Jerome Brunet
` (2 preceding siblings ...)
2019-06-13 11:42 ` [PATCH 3/4] ASoC: meson: axg-tdm: fix sample clock inversion Jerome Brunet
@ 2019-06-13 11:42 ` Jerome Brunet
2019-06-13 19:06 ` Applied "ASoC: meson: axg-tdm: consistently use SND_SOC_DAIFMT defines" to the asoc tree Mark Brown
3 siblings, 1 reply; 9+ messages in thread
From: Jerome Brunet @ 2019-06-13 11:42 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood, Kevin Hilman
Cc: devicetree, alsa-devel, linux-amlogic, linux-kernel, Jerome Brunet
There a mix of SND_SOC_DAIFMT_ and SND_SOC_DAI_FORMAT_ in
axg-tdm-interface.c. Even, if this is currently the same thing, lets use
the same group consistently.
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
sound/soc/meson/axg-tdm-interface.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/meson/axg-tdm-interface.c b/sound/soc/meson/axg-tdm-interface.c
index 585ce030b79b..d51f3344be7c 100644
--- a/sound/soc/meson/axg-tdm-interface.c
+++ b/sound/soc/meson/axg-tdm-interface.c
@@ -306,8 +306,8 @@ static int axg_tdm_iface_hw_params(struct snd_pcm_substream *substream,
}
break;
- case SND_SOC_DAI_FORMAT_DSP_A:
- case SND_SOC_DAI_FORMAT_DSP_B:
+ case SND_SOC_DAIFMT_DSP_A:
+ case SND_SOC_DAIFMT_DSP_B:
break;
default:
--
2.20.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Applied "ASoC: meson: axg-tdm: consistently use SND_SOC_DAIFMT defines" to the asoc tree
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 ` Mark Brown
0 siblings, 0 replies; 9+ messages in thread
From: Mark Brown @ 2019-06-13 19:06 UTC (permalink / raw)
To: Jerome Brunet
Cc: devicetree, alsa-devel, Kevin Hilman, Liam Girdwood,
linux-kernel, Mark Brown, linux-amlogic
The patch
ASoC: meson: axg-tdm: consistently use SND_SOC_DAIFMT defines
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.3
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 05113483fd300d7a4605a726770e7255e29f1ac7 Mon Sep 17 00:00:00 2001
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Thu, 13 Jun 2019 13:42:33 +0200
Subject: [PATCH] ASoC: meson: axg-tdm: consistently use SND_SOC_DAIFMT defines
There a mix of SND_SOC_DAIFMT_ and SND_SOC_DAI_FORMAT_ in
axg-tdm-interface.c. Even, if this is currently the same thing, lets use
the same group consistently.
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/meson/axg-tdm-interface.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/meson/axg-tdm-interface.c b/sound/soc/meson/axg-tdm-interface.c
index 585ce030b79b..d51f3344be7c 100644
--- a/sound/soc/meson/axg-tdm-interface.c
+++ b/sound/soc/meson/axg-tdm-interface.c
@@ -306,8 +306,8 @@ static int axg_tdm_iface_hw_params(struct snd_pcm_substream *substream,
}
break;
- case SND_SOC_DAI_FORMAT_DSP_A:
- case SND_SOC_DAI_FORMAT_DSP_B:
+ case SND_SOC_DAIFMT_DSP_A:
+ case SND_SOC_DAIFMT_DSP_B:
break;
default:
--
2.20.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Applied "ASoC: meson: axg-tdm: fix sample clock inversion" to the asoc tree
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
0 siblings, 0 replies; 9+ messages in thread
From: Mark Brown @ 2019-06-13 19:06 UTC (permalink / raw)
To: Jerome Brunet
Cc: devicetree, alsa-devel, Kevin Hilman, Liam Girdwood,
linux-kernel, Mark Brown, linux-amlogic
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
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Applied "ASoC: meson: axg-tdmout: right_j is not supported" to the asoc tree
2019-06-13 11:42 ` [PATCH 2/4] ASoC: meson: axg-tdmout: right_j is not supported Jerome Brunet
@ 2019-06-13 19:06 ` Mark Brown
0 siblings, 0 replies; 9+ messages in thread
From: Mark Brown @ 2019-06-13 19:06 UTC (permalink / raw)
To: Jerome Brunet
Cc: devicetree, alsa-devel, Kevin Hilman, Liam Girdwood,
linux-kernel, Mark Brown, linux-amlogic
The patch
ASoC: meson: axg-tdmout: right_j is not supported
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 7e0d7d0fbd06af0507611f85dba8daf24832abd9 Mon Sep 17 00:00:00 2001
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Thu, 13 Jun 2019 13:42:31 +0200
Subject: [PATCH] ASoC: meson: axg-tdmout: right_j is not supported
Right justified format is actually not supported by the amlogic tdm output
encoder.
Fixes: c41c2a355b86 ("ASoC: meson: add tdm output driver")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/meson/axg-tdmout.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/sound/soc/meson/axg-tdmout.c b/sound/soc/meson/axg-tdmout.c
index 527bfc4487e0..86537fc0ecb5 100644
--- a/sound/soc/meson/axg-tdmout.c
+++ b/sound/soc/meson/axg-tdmout.c
@@ -137,7 +137,6 @@ static int axg_tdmout_prepare(struct regmap *map,
break;
case SND_SOC_DAIFMT_LEFT_J:
- case SND_SOC_DAIFMT_RIGHT_J:
case SND_SOC_DAIFMT_DSP_B:
skew += 1;
break;
--
2.20.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Applied "ASoC: meson: axg-tdmin: right_j is not supported" to the asoc tree
2019-06-13 11:42 ` [PATCH 1/4] ASoC: meson: axg-tdmin: right_j is not supported Jerome Brunet
@ 2019-06-13 19:06 ` Mark Brown
0 siblings, 0 replies; 9+ messages in thread
From: Mark Brown @ 2019-06-13 19:06 UTC (permalink / raw)
To: Jerome Brunet
Cc: devicetree, alsa-devel, Kevin Hilman, Liam Girdwood,
linux-kernel, Mark Brown, linux-amlogic
The patch
ASoC: meson: axg-tdmin: right_j is not supported
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 47c317b786b6c1efc2cb3cdb894fd323422fe5ea Mon Sep 17 00:00:00 2001
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Thu, 13 Jun 2019 13:42:30 +0200
Subject: [PATCH] ASoC: meson: axg-tdmin: right_j is not supported
Right justified format is actually not supported by the amlogic tdm input
decoder.
Fixes: 13a22e6a98f8 ("ASoC: meson: add tdm input driver")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/meson/axg-tdmin.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/sound/soc/meson/axg-tdmin.c b/sound/soc/meson/axg-tdmin.c
index a790f925a4ef..cb87f17f3e95 100644
--- a/sound/soc/meson/axg-tdmin.c
+++ b/sound/soc/meson/axg-tdmin.c
@@ -121,7 +121,6 @@ static int axg_tdmin_prepare(struct regmap *map,
break;
case SND_SOC_DAIFMT_LEFT_J:
- case SND_SOC_DAIFMT_RIGHT_J:
case SND_SOC_DAIFMT_DSP_B:
break;
--
2.20.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-06-13 19:06 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` Applied "ASoC: meson: axg-tdm: fix sample clock inversion" to the asoc tree Mark Brown
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
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).