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

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

ASoC: topology: Fix bclk and fsync inversion in set_link_hw_format() 



[ Upstream commit a941e2fa ]

The values of bclk and fsync are inverted WRT the codec. But the existing
solution already works for Broadwell, see the alsa-lib config:

`alsa-lib/src/conf/topology/broadwell/broadwell.conf`

This commit provides the backwards-compatible solution to fix this misuse.

Signed-off-by: default avatarKirill Marinushkin <k.marinushkin@gmail.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Tested-by: default avatarPan Xiuli <xiuli.pan@linux.intel.com>
Tested-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: 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 e1d4f1e2

include/uapi/sound/asoc.h

+14 −2
Original line number Diff line number Diff line
@@ -160,6 +160,18 @@ 
#define SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_SAMPLEBITS    (1 << 2)

#define SND_SOC_TPLG_LNK_FLGBIT_VOICE_WAKEUP            (1 << 3)



/* DAI topology BCLK parameter

 * For the backwards capability, by default codec is bclk master

 */

#define SND_SOC_TPLG_BCLK_CM         0 /* codec is bclk master */

#define SND_SOC_TPLG_BCLK_CS         1 /* codec is bclk slave */



/* DAI topology FSYNC parameter

 * For the backwards capability, by default codec is fsync master

 */

#define SND_SOC_TPLG_FSYNC_CM         0 /* codec is fsync master */

#define SND_SOC_TPLG_FSYNC_CS         1 /* codec is fsync slave */



/*

 * Block Header.

 * This header precedes all object and object arrays below.
@@ -315,8 +327,8 @@ struct snd_soc_tplg_hw_config { 
	__u8 clock_gated;	/* 1 if clock can be gated to save power */

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

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

	__u8 bclk_master;	/* 1 for master of BCLK, 0 for slave */

	__u8 fsync_master;	/* 1 for master of FSYNC, 0 for slave */

	__u8 bclk_master;	/* SND_SOC_TPLG_BCLK_ value */

	__u8 fsync_master;	/* SND_SOC_TPLG_FSYNC_ value */

	__u8 mclk_direction;    /* 0 for input, 1 for output */

	__le16 reserved;	/* for 32bit alignment */

	__le32 mclk_rate;	/* MCLK or SYSCLK freqency in Hz */

sound/soc/soc-topology.c

+7 −5
Original line number Diff line number Diff line
@@ -2010,13 +2010,15 @@ static void set_link_hw_format(struct snd_soc_dai_link *link, 
			link->dai_fmt |= SND_SOC_DAIFMT_IB_IF;



		/* clock masters */

		bclk_master = hw_config->bclk_master;

		fsync_master = hw_config->fsync_master;

		if (!bclk_master && !fsync_master)

		bclk_master = (hw_config->bclk_master ==

			       SND_SOC_TPLG_BCLK_CM);

		fsync_master = (hw_config->fsync_master ==

				SND_SOC_TPLG_FSYNC_CM);

		if (bclk_master && fsync_master)

			link->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;

		else if (bclk_master && !fsync_master)

			link->dai_fmt |= SND_SOC_DAIFMT_CBS_CFM;

		else if (!bclk_master && fsync_master)

			link->dai_fmt |= SND_SOC_DAIFMT_CBS_CFM;

		else if (bclk_master && !fsync_master)

			link->dai_fmt |= SND_SOC_DAIFMT_CBM_CFS;

		else

			link->dai_fmt |= SND_SOC_DAIFMT_CBS_CFS;