On 12/17/19 8:56 AM, Pierre-Louis Bossart wrote:

Now that the legacy style is removed, we have to use the new macros for the codec configuration. This change was missed in the initial series.

Reported-by: Randy Dunlap rdunlap@infradead.org Cc: Kuninori Morimoto kuninori.morimoto.gx@renesas.com Fixes: ee8f537fd8b71c ("ASoC: soc-core: remove legacy style of codec_conf") Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com

Acked-by: Randy Dunlap rdunlap@infradead.org # build-tested

Thanks.

---

sound/soc/intel/boards/cml_rt1011_rt5682.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sound/soc/intel/boards/cml_rt1011_rt5682.c b/sound/soc/intel/boards/cml_rt1011_rt5682.c index a22f97234201..ab1196108d23 100644 --- a/sound/soc/intel/boards/cml_rt1011_rt5682.c +++ b/sound/soc/intel/boards/cml_rt1011_rt5682.c @@ -406,19 +406,19 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = {

static struct snd_soc_codec_conf rt1011_conf[] = { {

• .dev_name = "i2c-10EC1011:00",
  

• .dlc = COMP_CODEC_CONF("i2c-10EC1011:00"),
  

  .name_prefix = "WL", }, {

• .dev_name = "i2c-10EC1011:01",
  

• .dlc = COMP_CODEC_CONF("i2c-10EC1011:01"),
  

  .name_prefix = "WR", }, {

• .dev_name = "i2c-10EC1011:02",
  

• .dlc = COMP_CODEC_CONF("i2c-10EC1011:02"),
  

  .name_prefix = "TL", }, {

• .dev_name = "i2c-10EC1011:03",
  

• .dlc = COMP_CODEC_CONF("i2c-10EC1011:03"),
  

  .name_prefix = "TR", },

};

The patch

ASoC: Intel: cml_rt1011_rt5682: fix codec_conf by removing legacy style

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.6

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks, Mark

From 5610b90e6bb21ca31caa635bf0c17c1ee6cf1c08 Mon Sep 17 00:00:00 2001

From: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Date: Tue, 17 Dec 2019 10:56:48 -0600 Subject: [PATCH] ASoC: Intel: cml_rt1011_rt5682: fix codec_conf by removing legacy style

Now that the legacy style is removed, we have to use the new macros for the codec configuration. This change was missed in the initial series.

Reported-by: Randy Dunlap rdunlap@infradead.org Cc: Kuninori Morimoto kuninori.morimoto.gx@renesas.com Fixes: ee8f537fd8b71c ("ASoC: soc-core: remove legacy style of codec_conf") Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Acked-by: Randy Dunlap rdunlap@infradead.org # build-tested Acked-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com Link: https://lore.kernel.org/r/20191217165649.12091-1-pierre-louis.bossart@linux.... Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/intel/boards/cml_rt1011_rt5682.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sound/soc/intel/boards/cml_rt1011_rt5682.c b/sound/soc/intel/boards/cml_rt1011_rt5682.c index a22f97234201..ab1196108d23 100644 --- a/sound/soc/intel/boards/cml_rt1011_rt5682.c +++ b/sound/soc/intel/boards/cml_rt1011_rt5682.c @@ -406,19 +406,19 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = {

static struct snd_soc_codec_conf rt1011_conf[] = { { - .dev_name = "i2c-10EC1011:00", + .dlc = COMP_CODEC_CONF("i2c-10EC1011:00"), .name_prefix = "WL", }, { - .dev_name = "i2c-10EC1011:01", + .dlc = COMP_CODEC_CONF("i2c-10EC1011:01"), .name_prefix = "WR", }, { - .dev_name = "i2c-10EC1011:02", + .dlc = COMP_CODEC_CONF("i2c-10EC1011:02"), .name_prefix = "TL", }, { - .dev_name = "i2c-10EC1011:03", + .dlc = COMP_CODEC_CONF("i2c-10EC1011:03"), .name_prefix = "TR", }, };