* [PATCH 0/2] ASoC: meson: axg-tdm-formatter: add g12a reset
@ 2019-07-03 12:07 Jerome Brunet
2019-07-03 12:07 ` [PATCH 1/2] ASoC: meson: axg-tdm-formatter: add reset to the bindings documentation Jerome Brunet
2019-07-03 12:07 ` [PATCH 2/2] ASoC: meson: axg-tdm-formatter: add reset Jerome Brunet
0 siblings, 2 replies; 5+ messages in thread
From: Jerome Brunet @ 2019-07-03 12:07 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood, Kevin Hilman
Cc: devicetree, alsa-devel, linux-amlogic, linux-kernel, Jerome Brunet
This patchset add the possibility to provide a reset to the tdm formatter.
Such reset is available on the g12a SoC family and helps solve a random
channel output shift when using more than one output lane.
Jerome Brunet (2):
ASoC: meson: axg-tdm-formatter: add reset to the bindings
documentation
ASoC: meson: axg-tdm-formatter: add reset
.../sound/amlogic,axg-tdm-formatters.txt | 6 +++-
sound/soc/meson/axg-tdm-formatter.c | 29 +++++++++++++++++++
2 files changed, 34 insertions(+), 1 deletion(-)
--
2.21.0
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/2] ASoC: meson: axg-tdm-formatter: add reset to the bindings documentation 2019-07-03 12:07 [PATCH 0/2] ASoC: meson: axg-tdm-formatter: add g12a reset Jerome Brunet @ 2019-07-03 12:07 ` Jerome Brunet 2019-07-04 12:24 ` Applied "ASoC: meson: axg-tdm-formatter: add reset to the bindings documentation" to the asoc tree Mark Brown 2019-07-03 12:07 ` [PATCH 2/2] ASoC: meson: axg-tdm-formatter: add reset Jerome Brunet 1 sibling, 1 reply; 5+ messages in thread From: Jerome Brunet @ 2019-07-03 12:07 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Kevin Hilman Cc: devicetree, alsa-devel, linux-amlogic, linux-kernel, Jerome Brunet Add an optional reset property to the tdm formatter bindings. The dedicated reset line is present on some SoC families, such as the g12a. Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> --- .../bindings/sound/amlogic,axg-tdm-formatters.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/amlogic,axg-tdm-formatters.txt b/Documentation/devicetree/bindings/sound/amlogic,axg-tdm-formatters.txt index 3b94a715a0b9..8835a43edfbb 100644 --- a/Documentation/devicetree/bindings/sound/amlogic,axg-tdm-formatters.txt +++ b/Documentation/devicetree/bindings/sound/amlogic,axg-tdm-formatters.txt @@ -15,11 +15,15 @@ Required properties: * "lrclk" : sample clock * "lrclk_sel": sample clock input multiplexer -Example of TDMOUT_A on the A113 SoC: +Optional property: +- resets: phandle to the dedicated reset line of the tdm formatter. + +Example of TDMOUT_A on the S905X2 SoC: tdmout_a: audio-controller@500 { compatible = "amlogic,axg-tdmout"; reg = <0x0 0x500 0x0 0x40>; + resets = <&clkc_audio AUD_RESET_TDMOUT_A>; clocks = <&clkc_audio AUD_CLKID_TDMOUT_A>, <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK>, <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK_SEL>, -- 2.21.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Applied "ASoC: meson: axg-tdm-formatter: add reset to the bindings documentation" to the asoc tree 2019-07-03 12:07 ` [PATCH 1/2] ASoC: meson: axg-tdm-formatter: add reset to the bindings documentation Jerome Brunet @ 2019-07-04 12:24 ` Mark Brown 0 siblings, 0 replies; 5+ messages in thread From: Mark Brown @ 2019-07-04 12:24 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-formatter: add reset to the bindings documentation 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 094380ea2bf9f0fa7d63e67bf500b8c77e8d1910 Mon Sep 17 00:00:00 2001 From: Jerome Brunet <jbrunet@baylibre.com> Date: Wed, 3 Jul 2019 14:07:48 +0200 Subject: [PATCH] ASoC: meson: axg-tdm-formatter: add reset to the bindings documentation Add an optional reset property to the tdm formatter bindings. The dedicated reset line is present on some SoC families, such as the g12a. Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Link: https://lore.kernel.org/r/20190703120749.32341-2-jbrunet@baylibre.com Signed-off-by: Mark Brown <broonie@kernel.org> --- .../bindings/sound/amlogic,axg-tdm-formatters.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/amlogic,axg-tdm-formatters.txt b/Documentation/devicetree/bindings/sound/amlogic,axg-tdm-formatters.txt index 3b94a715a0b9..8835a43edfbb 100644 --- a/Documentation/devicetree/bindings/sound/amlogic,axg-tdm-formatters.txt +++ b/Documentation/devicetree/bindings/sound/amlogic,axg-tdm-formatters.txt @@ -15,11 +15,15 @@ Required properties: * "lrclk" : sample clock * "lrclk_sel": sample clock input multiplexer -Example of TDMOUT_A on the A113 SoC: +Optional property: +- resets: phandle to the dedicated reset line of the tdm formatter. + +Example of TDMOUT_A on the S905X2 SoC: tdmout_a: audio-controller@500 { compatible = "amlogic,axg-tdmout"; reg = <0x0 0x500 0x0 0x40>; + resets = <&clkc_audio AUD_RESET_TDMOUT_A>; clocks = <&clkc_audio AUD_CLKID_TDMOUT_A>, <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK>, <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK_SEL>, -- 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] 5+ messages in thread
* [PATCH 2/2] ASoC: meson: axg-tdm-formatter: add reset 2019-07-03 12:07 [PATCH 0/2] ASoC: meson: axg-tdm-formatter: add g12a reset Jerome Brunet 2019-07-03 12:07 ` [PATCH 1/2] ASoC: meson: axg-tdm-formatter: add reset to the bindings documentation Jerome Brunet @ 2019-07-03 12:07 ` Jerome Brunet 2019-07-04 12:24 ` Applied "ASoC: meson: axg-tdm-formatter: add reset" to the asoc tree Mark Brown 1 sibling, 1 reply; 5+ messages in thread From: Jerome Brunet @ 2019-07-03 12:07 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Kevin Hilman Cc: devicetree, alsa-devel, linux-amlogic, linux-kernel, Jerome Brunet Add the optional reset line handling which is present on the new SoC families, such as the g12a. Triggering this reset is not critical but it helps solve a channel shift issue on the g12a. Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> --- sound/soc/meson/axg-tdm-formatter.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/sound/soc/meson/axg-tdm-formatter.c b/sound/soc/meson/axg-tdm-formatter.c index 0c6cce5c5773..2e498201139f 100644 --- a/sound/soc/meson/axg-tdm-formatter.c +++ b/sound/soc/meson/axg-tdm-formatter.c @@ -7,6 +7,7 @@ #include <linux/module.h> #include <linux/of_platform.h> #include <linux/regmap.h> +#include <linux/reset.h> #include <sound/soc.h> #include "axg-tdm-formatter.h" @@ -20,6 +21,7 @@ struct axg_tdm_formatter { struct clk *lrclk; struct clk *sclk_sel; struct clk *lrclk_sel; + struct reset_control *reset; bool enabled; struct regmap *map; }; @@ -75,6 +77,24 @@ static int axg_tdm_formatter_enable(struct axg_tdm_formatter *formatter) if (formatter->enabled) return 0; + /* + * On the g12a (and possibly other SoCs), when a stream using + * multiple lanes is restarted, it will sometimes not start + * from the first lane, but randomly from another used one. + * The result is an unexpected and random channel shift. + * + * The hypothesis is that an HW counter is not properly reset + * and the formatter simply starts on the lane it stopped + * before. Unfortunately, there does not seems to be a way to + * reset this through the registers of the block. + * + * However, the g12a has indenpendent reset lines for each audio + * devices. Using this reset before each start solves the issue. + */ + ret = reset_control_reset(formatter->reset); + if (ret) + return ret; + /* * If sclk is inverted, invert it back and provide the inversion * required by the formatter @@ -306,6 +326,15 @@ int axg_tdm_formatter_probe(struct platform_device *pdev) return ret; } + /* Formatter dedicated reset line */ + formatter->reset = reset_control_get_optional_exclusive(dev, NULL); + if (IS_ERR(formatter->reset)) { + ret = PTR_ERR(formatter->reset); + if (ret != -EPROBE_DEFER) + dev_err(dev, "failed to get reset: %d\n", ret); + return ret; + } + return devm_snd_soc_register_component(dev, drv->component_drv, NULL, 0); } -- 2.21.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Applied "ASoC: meson: axg-tdm-formatter: add reset" to the asoc tree 2019-07-03 12:07 ` [PATCH 2/2] ASoC: meson: axg-tdm-formatter: add reset Jerome Brunet @ 2019-07-04 12:24 ` Mark Brown 0 siblings, 0 replies; 5+ messages in thread From: Mark Brown @ 2019-07-04 12:24 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-formatter: add reset 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 751bd5db52604f3f71d54dbad82707ef2475b707 Mon Sep 17 00:00:00 2001 From: Jerome Brunet <jbrunet@baylibre.com> Date: Wed, 3 Jul 2019 14:07:49 +0200 Subject: [PATCH] ASoC: meson: axg-tdm-formatter: add reset Add the optional reset line handling which is present on the new SoC families, such as the g12a. Triggering this reset is not critical but it helps solve a channel shift issue on the g12a. Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Link: https://lore.kernel.org/r/20190703120749.32341-3-jbrunet@baylibre.com Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/meson/axg-tdm-formatter.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/sound/soc/meson/axg-tdm-formatter.c b/sound/soc/meson/axg-tdm-formatter.c index 0c6cce5c5773..2e498201139f 100644 --- a/sound/soc/meson/axg-tdm-formatter.c +++ b/sound/soc/meson/axg-tdm-formatter.c @@ -7,6 +7,7 @@ #include <linux/module.h> #include <linux/of_platform.h> #include <linux/regmap.h> +#include <linux/reset.h> #include <sound/soc.h> #include "axg-tdm-formatter.h" @@ -20,6 +21,7 @@ struct axg_tdm_formatter { struct clk *lrclk; struct clk *sclk_sel; struct clk *lrclk_sel; + struct reset_control *reset; bool enabled; struct regmap *map; }; @@ -75,6 +77,24 @@ static int axg_tdm_formatter_enable(struct axg_tdm_formatter *formatter) if (formatter->enabled) return 0; + /* + * On the g12a (and possibly other SoCs), when a stream using + * multiple lanes is restarted, it will sometimes not start + * from the first lane, but randomly from another used one. + * The result is an unexpected and random channel shift. + * + * The hypothesis is that an HW counter is not properly reset + * and the formatter simply starts on the lane it stopped + * before. Unfortunately, there does not seems to be a way to + * reset this through the registers of the block. + * + * However, the g12a has indenpendent reset lines for each audio + * devices. Using this reset before each start solves the issue. + */ + ret = reset_control_reset(formatter->reset); + if (ret) + return ret; + /* * If sclk is inverted, invert it back and provide the inversion * required by the formatter @@ -306,6 +326,15 @@ int axg_tdm_formatter_probe(struct platform_device *pdev) return ret; } + /* Formatter dedicated reset line */ + formatter->reset = reset_control_get_optional_exclusive(dev, NULL); + if (IS_ERR(formatter->reset)) { + ret = PTR_ERR(formatter->reset); + if (ret != -EPROBE_DEFER) + dev_err(dev, "failed to get reset: %d\n", ret); + return ret; + } + return devm_snd_soc_register_component(dev, drv->component_drv, NULL, 0); } -- 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] 5+ messages in thread
end of thread, other threads:[~2019-07-04 12:25 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-07-03 12:07 [PATCH 0/2] ASoC: meson: axg-tdm-formatter: add g12a reset Jerome Brunet 2019-07-03 12:07 ` [PATCH 1/2] ASoC: meson: axg-tdm-formatter: add reset to the bindings documentation Jerome Brunet 2019-07-04 12:24 ` Applied "ASoC: meson: axg-tdm-formatter: add reset to the bindings documentation" to the asoc tree Mark Brown 2019-07-03 12:07 ` [PATCH 2/2] ASoC: meson: axg-tdm-formatter: add reset Jerome Brunet 2019-07-04 12:24 ` Applied "ASoC: meson: axg-tdm-formatter: add reset" 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).