| Message ID | 20180220174446.7784-3-k.marinushkin@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Feb 20, 2018 at 7:44 PM, Kirill Marinushkin <k.marinushkin@gmail.com> wrote: > Clock gating parameter is a part of `dai_fmt`. It is supported by > `alsa-lib` when creating a topology binary file, but ignored by kernel > when loading this topology file. > + /* clock gating */ > + if (hw_config->clock_gated == SND_SOC_TPLG_DAI_CLK_GATE_GATED) > + link->dai_fmt |= SND_SOC_DAIFMT_GATED; > + else if (hw_config->clock_gated == > + SND_SOC_TPLG_DAI_CLK_GATE_CONT) A nit, I would leave it on the same line, even if it ~2-3 characters longer than 80. > + link->dai_fmt |= SND_SOC_DAIFMT_CONT; > +
On 02/21/18 15:50, Andy Shevchenko wrote: > On Tue, Feb 20, 2018 at 7:44 PM, Kirill Marinushkin > <k.marinushkin@gmail.com> wrote: >> Clock gating parameter is a part of `dai_fmt`. It is supported by >> `alsa-lib` when creating a topology binary file, but ignored by kernel >> when loading this topology file. >> + /* clock gating */ >> + if (hw_config->clock_gated == SND_SOC_TPLG_DAI_CLK_GATE_GATED) >> + link->dai_fmt |= SND_SOC_DAIFMT_GATED; >> + else if (hw_config->clock_gated == >> + SND_SOC_TPLG_DAI_CLK_GATE_CONT) > A nit, I would leave it on the same line, even if it ~2-3 characters > longer than 80. Hello Andy, Thank you for the comment. I think it is important to stay in the length of 80. I understand your point, but from my perspective, the coding style is a higher priority guideline. Therefore I would prefer to keep this line as it is now. Beast Regards, Kirill >> + link->dai_fmt |= SND_SOC_DAIFMT_CONT; >> +
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 01a50413c66f..bac70676a6b4 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1981,6 +1981,13 @@ static void set_link_hw_format(struct snd_soc_dai_link *link, link->dai_fmt = hw_config->fmt & SND_SOC_DAIFMT_FORMAT_MASK; + /* clock gating */ + if (hw_config->clock_gated == SND_SOC_TPLG_DAI_CLK_GATE_GATED) + link->dai_fmt |= SND_SOC_DAIFMT_GATED; + else if (hw_config->clock_gated == + SND_SOC_TPLG_DAI_CLK_GATE_CONT) + link->dai_fmt |= SND_SOC_DAIFMT_CONT; + /* clock signal polarity */ invert_bclk = hw_config->invert_bclk; invert_fsync = hw_config->invert_fsync;
Clock gating parameter is a part of `dai_fmt`. It is supported by `alsa-lib` when creating a topology binary file, but ignored by kernel when loading this topology file. After applying this commit, the clock gating parameter is not ignored any more. The old behaviour is not broken, as by default the parameter value is 0. For example, the following config, based on alsa-lib/src/conf/topology/broadwell/broadwell.conf, is now supported: ~~~~ SectionHWConfig."CodecHWConfig" { id "1" format "I2S" # physical audio format. bclk "master" # Platform is master of bit clock fsync "master" # platform is master of fsync pm_gate_clocks "true" # clock can be gated } SectionLink."Codec" { # used for binding to the physical link id "0" hw_configs [ "CodecHWConfig" ] default_hw_conf_id "1" } ~~~~ Signed-off-by: Kirill Marinushkin <k.marinushkin@gmail.com> Cc: Mark Brown <broonie@kernel.org> Cc: Takashi Sakamoto <o-takashi@sakamocchi.jp> Cc: Takashi Iwai <tiwai@suse.com> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org --- sound/soc/soc-topology.c | 7 +++++++ 1 file changed, 7 insertions(+)