From 93e03bdc2a3dcd5d12516f5de78e14d88a32ff2c Mon Sep 17 00:00:00 2001

From: Jaroslav Kysela <perex@perex.cz>

Date: Wed, 4 Apr 2018 09:58:12 +0200

Subject: [PATCH 01/26] alsa.conf: change the location for add-on configs to

 /etc/alsa/conf.d

The add-on configuration files should be placed to a volatile place.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

---

 src/conf/alsa.conf | 8 +-------

 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf

index f22918fb..bb00ff40 100644

--- a/src/conf/alsa.conf

+++ b/src/conf/alsa.conf

@@ -8,13 +8,7 @@

 	{

 		func load

 		files [

-			{

-				@func concat

-				strings [

-					{ @func datadir }

-					"/alsa.conf.d/"

-				]

-			}

+			"/etc/alsa/conf.d"

 			"/etc/asound.conf"

 			"~/.asoundrc"

 		]

-- 

2.13.6

From 78505dccd23546cc77e5221cb21c01325bc0138d Mon Sep 17 00:00:00 2001

From: Jaroslav Kysela <perex@perex.cz>

Date: Wed, 4 Apr 2018 10:02:49 +0200

Subject: [PATCH 02/26] conf: remove alsa.conf.d from the datadir

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

---

 src/conf/Makefile.am             | 2 +-

 src/conf/alsa.conf.d/Makefile.am | 8 --------

 src/conf/alsa.conf.d/README      | 2 --

 3 files changed, 1 insertion(+), 11 deletions(-)

 delete mode 100644 src/conf/alsa.conf.d/Makefile.am

 delete mode 100644 src/conf/alsa.conf.d/README

diff --git a/src/conf/Makefile.am b/src/conf/Makefile.am

index ef2ea9c1..2b46f95c 100644

--- a/src/conf/Makefile.am

+++ b/src/conf/Makefile.am

@@ -1,4 +1,4 @@

-SUBDIRS=cards pcm alsa.conf.d

+SUBDIRS=cards pcm

 if BUILD_UCM

 SUBDIRS += ucm

diff --git a/src/conf/alsa.conf.d/Makefile.am b/src/conf/alsa.conf.d/Makefile.am

deleted file mode 100644

index c91661e9..00000000

--- a/src/conf/alsa.conf.d/Makefile.am

+++ /dev/null

@@ -1,8 +0,0 @@

-alsaconfigdir = @ALSA_CONFIG_DIR@

-alsadir = $(alsaconfigdir)/alsa.conf.d

-cfg_files = README

-

-alsa_DATA = $(cfg_files)

-

-EXTRA_DIST = \

-	$(cfg_files)

diff --git a/src/conf/alsa.conf.d/README b/src/conf/alsa.conf.d/README

deleted file mode 100644

index 99978848..00000000

--- a/src/conf/alsa.conf.d/README

+++ /dev/null

@@ -1,2 +0,0 @@

-You can place files named *.conf in this folder and they will be processed

-when initialising alsa-lib.

-- 

2.13.6

From 17bc74d3a25f0d4b1ca25d2d92fcad9c2a9d7f79 Mon Sep 17 00:00:00 2001

From: Jaroslav Kysela <perex@perex.cz>

Date: Tue, 10 Apr 2018 08:57:07 +0200

Subject: [PATCH 03/26] configure: remove src/conf/alsa.conf.d/Makefile

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

---

 configure.ac | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac

index cce195ae..5bc1994f 100644

--- a/configure.ac

+++ b/configure.ac

@@ -713,7 +713,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \

 	  src/rawmidi/Makefile src/timer/Makefile \

           src/hwdep/Makefile src/seq/Makefile src/ucm/Makefile \

           src/alisp/Makefile src/topology/Makefile \

-	  src/conf/Makefile src/conf/alsa.conf.d/Makefile \

+	  src/conf/Makefile \

 	  src/conf/cards/Makefile \

 	  src/conf/pcm/Makefile \

 	  src/conf/ucm/Makefile \

-- 

2.13.6

From 3778a30bb0095c7d3275735718f33058e3c198d5 Mon Sep 17 00:00:00 2001

From: Kirill Marinushkin <k.marinushkin@gmail.com>

Date: Mon, 16 Apr 2018 20:26:38 +0200

Subject: [PATCH 04/26] ASoC: topology: Fix bclk and fsync inversion in

 set_link_hw_format()

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.

This commit goes in pair with the corresponding patch for linux.

Signed-off-by: Kirill Marinushkin <k.marinushkin@gmail.com>

Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Tested-by: Pan Xiuli <xiuli.pan@linux.intel.com>

Tested-by: Pierre-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: Takashi Iwai <tiwai@suse.de>

---

 include/sound/asoc.h                       | 16 ++++++++++++++--

 include/topology.h                         |  4 ++--

 src/conf/topology/broadwell/broadwell.conf |  4 ++--

 src/topology/pcm.c                         | 30 ++++++++++++++++++++++++++----

 4 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/include/sound/asoc.h b/include/sound/asoc.h

index 0f5d9f9a..89b00703 100644

--- a/include/sound/asoc.h

+++ b/include/sound/asoc.h

@@ -156,6 +156,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.

@@ -311,8 +323,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 */

diff --git a/include/topology.h b/include/topology.h

index 8779da4d..5d7b46df 100644

--- a/include/topology.h

+++ b/include/topology.h

@@ -1000,8 +1000,8 @@ struct snd_tplg_hw_config_template {

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

 	unsigned char  invert_bclk;     /* 1 for inverted BCLK, 0 for normal */

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

-	unsigned char  bclk_master;     /* 1 for master of BCLK, 0 for slave */

-	unsigned char  fsync_master;    /* 1 for master of FSYNC, 0 for slave */

+	unsigned char  bclk_master;     /* SND_SOC_TPLG_BCLK_ value */

+	unsigned char  fsync_master;    /* SND_SOC_TPLG_FSYNC_ value */

 	unsigned char  mclk_direction;  /* 0 for input, 1 for output */

 	unsigned short reserved;        /* for 32bit alignment */

 	unsigned int mclk_rate;	        /* MCLK or SYSCLK freqency in Hz */

diff --git a/src/conf/topology/broadwell/broadwell.conf b/src/conf/topology/broadwell/broadwell.conf

index b8405d93..09fc4daa 100644

--- a/src/conf/topology/broadwell/broadwell.conf

+++ b/src/conf/topology/broadwell/broadwell.conf

@@ -393,8 +393,8 @@ SectionGraph."dsp" {

 SectionHWConfig."CodecHWConfig" {

 	id "1"

 	format "I2S"		# physical audio format.

-	bclk   "master"		# Platform is master of bit clock

-	fsync  "master"		# platform is master of fsync

+	bclk   "codec_slave"	# platform is master of bit clock (codec is slave)

+	fsync  "codec_slave"	# platform is master of fsync (codec is slave)

 }

 SectionLink."Codec" {

diff --git a/src/topology/pcm.c b/src/topology/pcm.c

index bb47b9af..d0395182 100644

--- a/src/topology/pcm.c

+++ b/src/topology/pcm.c

@@ -1141,8 +1141,19 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,

 			if (snd_config_get_string(n, &val) < 0)

 				return -EINVAL;

-			if (!strcmp(val, "master"))

-				hw_cfg->bclk_master = true;

+			if (!strcmp(val, "master")) {

+				/* For backwards capability,

+				 * "master" == "codec is slave"

+				 */

+				SNDERR("warning: deprecated bclk value '%s'\n",

+				       val);

+

+				hw_cfg->bclk_master = SND_SOC_TPLG_BCLK_CS;

+			} else if (!strcmp(val, "codec_slave")) {

+				hw_cfg->bclk_master = SND_SOC_TPLG_BCLK_CS;

+			} else if (!strcmp(val, "codec_master")) {

+				hw_cfg->bclk_master = SND_SOC_TPLG_BCLK_CM;

+			}

 			continue;

 		}

@@ -1167,8 +1178,19 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,

 			if (snd_config_get_string(n, &val) < 0)

 				return -EINVAL;

-			if (!strcmp(val, "master"))

-				hw_cfg->fsync_master = true;

+			if (!strcmp(val, "master")) {

+				/* For backwards capability,

+				 * "master" == "codec is slave"

+				 */

+				SNDERR("warning: deprecated fsync value '%s'\n",

+				       val);

+

+				hw_cfg->fsync_master = SND_SOC_TPLG_FSYNC_CS;

+			} else if (!strcmp(val, "codec_slave")) {

+				hw_cfg->fsync_master = SND_SOC_TPLG_FSYNC_CS;

+			} else if (!strcmp(val, "codec_master")) {

+				hw_cfg->fsync_master = SND_SOC_TPLG_FSYNC_CM;

+			}

 			continue;

 		}

-- 

2.13.6

From bdb709ab2a091743980c9154950c01f0c540476b Mon Sep 17 00:00:00 2001

From: Kirill Marinushkin <k.marinushkin@gmail.com>

Date: Mon, 16 Apr 2018 20:26:39 +0200

Subject: [PATCH 05/26] ASoC: topology: Add missing clock gating parameter when

 parsing hw_configs

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: Kirill Marinushkin <k.marinushkin@gmail.com>

Reviewed-by: Pierre-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: Takashi Iwai <tiwai@suse.de>

---

 include/sound/asoc.h | 7 ++++++-

 include/topology.h   | 2 +-

 src/topology/pcm.c   | 6 +++++-

 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/include/sound/asoc.h b/include/sound/asoc.h

index 89b00703..297e837c 100644

--- a/include/sound/asoc.h

+++ b/include/sound/asoc.h

@@ -135,6 +135,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.

  */

@@ -320,7 +325,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 */

diff --git a/include/topology.h b/include/topology.h

index 5d7b46df..3793115c 100644

--- a/include/topology.h

+++ b/include/topology.h

@@ -997,7 +997,7 @@ struct snd_tplg_pcm_template {

 struct snd_tplg_hw_config_template {

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

 	unsigned int fmt;               /* SND_SOC_DAI_FORMAT_ format value */

-	unsigned char clock_gated;      /* 1 if clock can be gated to save power */

+	unsigned char clock_gated;      /* SND_SOC_TPLG_DAI_CLK_GATE_ value */

 	unsigned char  invert_bclk;     /* 1 for inverted BCLK, 0 for normal */

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

 	unsigned char  bclk_master;     /* SND_SOC_TPLG_BCLK_ value */

diff --git a/src/topology/pcm.c b/src/topology/pcm.c

index d0395182..b53f6b03 100644

--- a/src/topology/pcm.c

+++ b/src/topology/pcm.c

@@ -1233,7 +1233,11 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,

 				return -EINVAL;

 			if (!strcmp(val, "true"))

-				hw_cfg->clock_gated = true;

+				hw_cfg->clock_gated =

+					SND_SOC_TPLG_DAI_CLK_GATE_GATED;

+			else

+				hw_cfg->clock_gated =

+					SND_SOC_TPLG_DAI_CLK_GATE_CONT;

 			continue;

 		}

-- 

2.13.6

From 7cf73b56e4505ad194f5789293494a6ebaa1feff Mon Sep 17 00:00:00 2001

From: Kirill Marinushkin <k.marinushkin@gmail.com>

Date: Mon, 16 Apr 2018 20:26:40 +0200

Subject: [PATCH 06/26] ASoC: topology: Add definitions for mclk_direction

 values

Current comment makes not clear the direction of mclk. Previously, similar

description caused a misunderstanding for bclk_master and fsync_master.

This commit solves the potential confusion the same way it is solved for

bclk_master and fsync_master.

Signed-off-by: Kirill Marinushkin <k.marinushkin@gmail.com>

Acked-by: Pierre-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: alsa-devel@alsa-project.org

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 include/sound/asoc.h |  6 +++++-

 include/topology.h   |  2 +-

 src/topology/pcm.c   | 15 +++++++++++++--

 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/include/sound/asoc.h b/include/sound/asoc.h

index 297e837c..bb8aec78 100644

--- a/include/sound/asoc.h

+++ b/include/sound/asoc.h

@@ -140,6 +140,10 @@

 #define SND_SOC_TPLG_DAI_CLK_GATE_GATED	1

 #define SND_SOC_TPLG_DAI_CLK_GATE_CONT		2

+/* DAI mclk_direction */

+#define SND_SOC_TPLG_MCLK_CO            0 /* for codec, mclk is output */

+#define SND_SOC_TPLG_MCLK_CI            1 /* for codec, mclk is input */

+

 /* DAI physical PCM data formats.

  * Add new formats to the end of the list.

  */

@@ -330,7 +334,7 @@ struct snd_soc_tplg_hw_config {

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

 	__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 */

+	__u8 mclk_direction;    /* SND_SOC_TPLG_MCLK_ value */

 	__le16 reserved;	/* for 32bit alignment */

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

 	__le32 bclk_rate;	/* BCLK freqency in Hz */

diff --git a/include/topology.h b/include/topology.h

index 3793115c..27da7308 100644

--- a/include/topology.h

+++ b/include/topology.h

@@ -1002,7 +1002,7 @@ struct snd_tplg_hw_config_template {

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

 	unsigned char  bclk_master;     /* SND_SOC_TPLG_BCLK_ value */

 	unsigned char  fsync_master;    /* SND_SOC_TPLG_FSYNC_ value */

-	unsigned char  mclk_direction;  /* 0 for input, 1 for output */

+	unsigned char  mclk_direction;  /* SND_SOC_TPLG_MCLK_ value */

 	unsigned short reserved;        /* for 32bit alignment */

 	unsigned int mclk_rate;	        /* MCLK or SYSCLK freqency in Hz */

 	unsigned int bclk_rate;	        /* BCLK freqency in Hz */

diff --git a/src/topology/pcm.c b/src/topology/pcm.c

index b53f6b03..2ce1651b 100644

--- a/src/topology/pcm.c

+++ b/src/topology/pcm.c

@@ -1223,8 +1223,19 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,

 			if (snd_config_get_string(n, &val) < 0)

 				return -EINVAL;

-			if (!strcmp(val, "master"))

-				hw_cfg->mclk_direction = true;

+			if (!strcmp(val, "master")) {

+				/* For backwards capability,

+				 * "master" == "for codec, mclk is input"

+				 */

+				SNDERR("warning: deprecated mclk value '%s'\n",

+				       val);

+

+				hw_cfg->mclk_direction = SND_SOC_TPLG_MCLK_CI;

+			} else if (!strcmp(val, "codec_mclk_in")) {

+				hw_cfg->mclk_direction = SND_SOC_TPLG_MCLK_CI;

+			} else if (!strcmp(val, "codec_mclk_out")) {

+				hw_cfg->mclk_direction = SND_SOC_TPLG_MCLK_CO;

+			}

 			continue;

 		}

-- 

2.13.6

From 4493f6a560a315970f5b068126120526a04ae6a2 Mon Sep 17 00:00:00 2001

From: Kirill Marinushkin <k.marinushkin@gmail.com>

Date: Mon, 16 Apr 2018 20:26:41 +0200

Subject: [PATCH 07/26] ASoC: topology: Add alias conf parameter names for

 hw_configs

Currently, some parameter names in conf differ from field names in struct.

These look like typos.

This commit suggests to add aliases for such parameters, so that the names

in conf are similar to names in struct. This solution is backwards

compatible.

If the difference between conf names and struct names is done on purpose -

this commit can be dropped.

Signed-off-by: Kirill Marinushkin <k.marinushkin@gmail.com>

Acked-by: Pierre-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: alsa-devel@alsa-project.org

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 src/topology/pcm.c | 30 ++++++++++++++++++++----------

 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/topology/pcm.c b/src/topology/pcm.c

index 2ce1651b..8ebfafd8 100644

--- a/src/topology/pcm.c

+++ b/src/topology/pcm.c

@@ -1126,7 +1126,8 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,

 			continue;

 		}

-		if (strcmp(id, "format") == 0) {

+		if (strcmp(id, "format") == 0 ||

+		    strcmp(id, "fmt") == 0) {

 			if (snd_config_get_string(n, &val) < 0)

 				return -EINVAL;

@@ -1137,7 +1138,8 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,

 			continue;

 		}

-		if (strcmp(id, "bclk") == 0) {

+		if (strcmp(id, "bclk") == 0 ||

+		    strcmp(id, "bclk_master") == 0) {

 			if (snd_config_get_string(n, &val) < 0)

 				return -EINVAL;

@@ -1157,7 +1159,8 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,

 			continue;

 		}

-		if (strcmp(id, "bclk_freq") == 0) {

+		if (strcmp(id, "bclk_freq") == 0 ||

+		    strcmp(id, "bclk_rate") == 0) {

 			if (snd_config_get_string(n, &val) < 0)

 				return -EINVAL;

@@ -1165,7 +1168,8 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,

 			continue;

 		}

-		if (strcmp(id, "bclk_invert") == 0) {

+		if (strcmp(id, "bclk_invert") == 0 ||

+		    strcmp(id, "invert_bclk") == 0) {

 			if (snd_config_get_string(n, &val) < 0)

 				return -EINVAL;

@@ -1174,7 +1178,8 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,

 			continue;

 		}

-		if (strcmp(id, "fsync") == 0) {

+		if (strcmp(id, "fsync") == 0 ||

+		    strcmp(id, "fsync_master") == 0) {

 			if (snd_config_get_string(n, &val) < 0)

 				return -EINVAL;

@@ -1194,7 +1199,8 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,

 			continue;

 		}

-		if (strcmp(id, "fsync_invert") == 0) {

+		if (strcmp(id, "fsync_invert") == 0 ||

+		    strcmp(id, "invert_fsync") == 0) {

 			if (snd_config_get_string(n, &val) < 0)

 				return -EINVAL;

@@ -1203,7 +1209,8 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,

 			continue;

 		}

-		if (strcmp(id, "fsync_freq") == 0) {

+		if (strcmp(id, "fsync_freq") == 0 ||

+		    strcmp(id, "fsync_rate") == 0) {

 			if (snd_config_get_string(n, &val) < 0)

 				return -EINVAL;

@@ -1211,7 +1218,8 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,

 			continue;

 		}

-		if (strcmp(id, "mclk_freq") == 0) {

+		if (strcmp(id, "mclk_freq") == 0 ||

+		    strcmp(id, "mclk_rate") == 0) {

 			if (snd_config_get_string(n, &val) < 0)

 				return -EINVAL;

@@ -1219,7 +1227,8 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,

 			continue;

 		}

-		if (strcmp(id, "mclk") == 0) {

+		if (strcmp(id, "mclk") == 0 ||

+		    strcmp(id, "mclk_direction") == 0) {

 			if (snd_config_get_string(n, &val) < 0)

 				return -EINVAL;

@@ -1239,7 +1248,8 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,

 			continue;

 		}

-		if (strcmp(id, "pm_gate_clocks") == 0) {

+		if (strcmp(id, "pm_gate_clocks") == 0 ||

+		    strcmp(id, "clock_gated") == 0) {

 			if (snd_config_get_string(n, &val) < 0)

 				return -EINVAL;

-- 

2.13.6

From 23a20cda111232b5d21dde12d10e19e4ecb71cea Mon Sep 17 00:00:00 2001

From: Ricard Wanderlof <ricard.wanderlof@axis.com>

Date: Wed, 18 Apr 2018 17:03:09 +0200

Subject: [PATCH 08/26] pcm: softvol: Allow up to 90 dB of gain

The gain algorithm used in softvol can handle gain factors of up to

32767 which is slightly more than 90 dB, so allow a max_dB of 90 dB.

This doesn't affect existing asound.conf files, but does allow a

max_dB of up to 90 dB when needed.

Tested using Audacity that there is no undue distorsion or other

artefacts when 90 dB of gain is applied to a suitable signal (i.e.

a signal quiet enough not be clipped whan applying 90 dB of gain).

Signed-off-by: Ricard Wanderlof <ricardw@axis.com>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 src/pcm/pcm_softvol.c | 6 +++++-

 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pcm/pcm_softvol.c b/src/pcm/pcm_softvol.c

index 8bb4a397..0eaeacef 100644

--- a/src/pcm/pcm_softvol.c

+++ b/src/pcm/pcm_softvol.c

@@ -59,7 +59,11 @@ typedef struct {

 #define PRESET_RESOLUTION	256

 #define PRESET_MIN_DB		-51.0

 #define ZERO_DB                  0.0

-#define MAX_DB_UPPER_LIMIT      50

+/*

+ * The gain algorithm as it stands supports gain factors up to 32767, which

+ * is a fraction more than 90 dB, so set 90 dB as the maximum possible gain.

+ */

+#define MAX_DB_UPPER_LIMIT      90

 static const unsigned int preset_dB_value[PRESET_RESOLUTION] = {

 	0x00b8, 0x00bd, 0x00c1, 0x00c5, 0x00ca, 0x00cf, 0x00d4, 0x00d9,

-- 

2.13.6

From 181f8e251bc05832f9c9401544e680ea0572a2e3 Mon Sep 17 00:00:00 2001

From: Hui Wang <hui.wang@canonical.com>

Date: Wed, 2 May 2018 14:08:05 +0800

Subject: [PATCH 09/26] ucm: adding the folder of card_long_name when finding

 verb conf file

The board configuration file and verb conf file are allowed to be

in the folder named of card_long_name, so when finding the verb conf

file, we need to check if it is in the folder of card_long_name or

card_name.

Signed-off-by: Hui Wang <hui.wang@canonical.com>

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

---

 src/ucm/parser.c | 10 ++++++++--

 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/ucm/parser.c b/src/ucm/parser.c

index 2d76152f..219edb96 100644

--- a/src/ucm/parser.c

+++ b/src/ucm/parser.c

@@ -1056,6 +1056,7 @@ static int parse_verb_file(snd_use_case_mgr_t *uc_mgr,

 	char filename[MAX_FILE];

 	char *env = getenv(ALSA_CONFIG_UCM_VAR);

 	int err;

+	char *folder_name;

 	/* allocate verb */

 	verb = calloc(1, sizeof(struct use_case_verb));

@@ -1082,12 +1083,17 @@ static int parse_verb_file(snd_use_case_mgr_t *uc_mgr,

 	}

 	/* open Verb file for reading */

+	if (!strncmp(uc_mgr->conf_file_name, uc_mgr->card_long_name, MAX_CARD_LONG_NAME))

+		folder_name = uc_mgr->card_long_name;

+	else

+		folder_name = uc_mgr->card_name;

+

 	if (env)

 		snprintf(filename, sizeof(filename), "%s/%s/%s",

-			 env, uc_mgr->card_name, file);

+			 env, folder_name, file);

 	else

 		snprintf(filename, sizeof(filename), "%s/ucm/%s/%s",

-			 snd_config_topdir(), uc_mgr->card_name, file);

+			 snd_config_topdir(), folder_name, file);

 	filename[sizeof(filename)-1] = '\0';

 	err = uc_mgr_config_load(filename, &cfg;;

-- 

2.13.6

From 81db276f8c2235adc83e9698b0174265f6482655 Mon Sep 17 00:00:00 2001

From: Hui Wang <hui.wang@canonical.com>

Date: Wed, 2 May 2018 14:08:06 +0800

Subject: [PATCH 10/26] conf/ucm: increase the input volume for LineIn

Otherwise, the boost value is 0, and the sound captured from that

LineIn jack is too weak for users.

Signed-off-by: Hui Wang <hui.wang@canonical.com>

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

---

 src/conf/ucm/HDAudio-Lenovo-DualCodecs/HiFi.conf | 1 +

 1 file changed, 1 insertion(+)

diff --git a/src/conf/ucm/HDAudio-Lenovo-DualCodecs/HiFi.conf b/src/conf/ucm/HDAudio-Lenovo-DualCodecs/HiFi.conf

index 50967896..ece780da 100644

--- a/src/conf/ucm/HDAudio-Lenovo-DualCodecs/HiFi.conf