Patch "ASoC: topology: Fix bclk and fsync inversion in set_link_hw_format()" has been added to the 4.14-stable tree
[email protected]
AppliedThis is a note to let you know that I've just added the patch titled
ASoC: topology: Fix bclk and fsync inversion in set_link_hw_format()
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-topology-fix-bclk-and-fsync-inversion-in-set_link_hw_format.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Sat Jul 28 10:25:26 CEST 2018
From: Kirill Marinushkin <[email protected]>
Date: Wed, 4 Apr 2018 06:19:37 +0200
Subject: ASoC: topology: Fix bclk and fsync inversion in set_link_hw_format()
From: Kirill Marinushkin <[email protected]>
[ Upstream commit a941e2fab3207cb0d57dc4ec47b1b12c8ea78b84 ]
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.
--- include/uapi/sound/asoc.h | 16 ++++++++++++++-- sound/soc/soc-topology.c | 12 +++++++----- 2 files changed, 21 insertions(+), 7 deletions(-)
include/uapi/sound/asoc.h +14 -2
@@ -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
@@ -2010,13 +2010,15 @@ static void set_link_hw_format(struct sn 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 ;
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/asoc-topology-fix-bclk-and-fsync-inversion-in-set_link_hw_format.patch queue-4.14/asoc-topology-add-missing-clock-gating-parameter-when-parsing-hw_configs.patch