Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2fdb85a authored by Kirill Marinushkin's avatar Kirill Marinushkin Committed by Greg Kroah-Hartman
Browse files

ASoC: topology: Add missing clock gating parameter when parsing hw_configs 



[ Upstream commit 933e1c4a667103c4d10ebdc9505a0a6abd8c3fbd ]

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. This solution is backwards compatible. The existing behaviour is
not broken, because by default the parameter value is 0 and is ignored.

snd_soc_tplg_hw_config.clock_gated = 0 => no effect
snd_soc_tplg_hw_config.clock_gated = 1 => SND_SOC_DAIFMT_GATED
snd_soc_tplg_hw_config.clock_gated = 2 => SND_SOC_DAIFMT_CONT

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.
        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: default avatarKirill Marinushkin <k.marinushkin@gmail.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Mark Brown <broonie@kernel.org>
Cc: Pan Xiuli <xiuli.pan@linux.intel.com>
Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Cc: linux-kernel@vger.kernel.org
Cc: alsa-devel@alsa-project.org
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b754906c

include/uapi/sound/asoc.h

+6 −1
Original line number Diff line number Diff line
@@ -139,6 +139,11 @@ 
#define SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_CHANNELS      (1 << 1)

#define SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_SAMPLEBITS    (1 << 2)



/* DAI clock gating */

#define SND_SOC_TPLG_DAI_CLK_GATE_UNDEFINED	0

#define SND_SOC_TPLG_DAI_CLK_GATE_GATED	1

#define SND_SOC_TPLG_DAI_CLK_GATE_CONT		2



/* DAI physical PCM data formats.

 * Add new formats to the end of the list.

 */
@@ -324,7 +329,7 @@ struct snd_soc_tplg_hw_config { 
	__le32 size;            /* in bytes of this structure */

	__le32 id;		/* unique ID - - used to match */

	__le32 fmt;		/* SND_SOC_DAI_FORMAT_ format value */

	__u8 clock_gated;	/* 1 if clock can be gated to save power */

	__u8 clock_gated;	/* SND_SOC_TPLG_DAI_CLK_GATE_ value */

	__u8 invert_bclk;	/* 1 for inverted BCLK, 0 for normal */

	__u8 invert_fsync;	/* 1 for inverted frame clock, 0 for normal */

	__u8 bclk_master;	/* SND_SOC_TPLG_BCLK_ value */

sound/soc/soc-topology.c

+7 −0
Original line number Diff line number Diff line
@@ -1997,6 +1997,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;