Unverified Commit 44ce45f8 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: Fix dailink checks for DPCM" from Pierre-Louis Bossart... 

Merge series "ASoC: Fix dailink checks for DPCM" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

We've had a couple of changes that introduce regressions with the
multi-cpu DAI solutions, and while trying to fix them we found
additional inconsistencies that should also go to stable branches.

Bard Liao (1):
  ASoC: core: only convert non DPCM link to DPCM link

Pierre-Louis Bossart (3):
  ASoC: soc-pcm: dpcm: fix playback/capture checks
  ASoC: Intel: boards: replace capture_only by dpcm_capture
  ASoC: SOF: nocodec: conditionally set dpcm_capture/dpcm_playback flags

 sound/soc/intel/boards/glk_rt5682_max98357a.c |  2 +-
 sound/soc/intel/boards/kbl_da7219_max98927.c  |  4 +-
 sound/soc/intel/boards/kbl_rt5663_max98927.c  |  2 +-
 .../intel/boards/kbl_rt5663_rt5514_max98927.c |  2 +-
 sound/soc/soc-core.c                          | 22 ++++++++--
 sound/soc/soc-pcm.c                           | 44 ++++++++++++++-----
 sound/soc/sof/nocodec.c                       |  6 ++-
 7 files changed, 62 insertions(+), 20 deletions(-)

base-commit: 8a9144c1
--
2.20.1
parents 79d4f823 ba4e5abc

sound/soc/intel/boards/glk_rt5682_max98357a.c

+1 −1
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { 
		.name = "Glk Audio Echo Reference cap",

		.stream_name = "Echoreference Capture",

		.init = NULL,

		.capture_only = 1,

		.dpcm_capture = 1,

		.nonatomic = 1,

		.dynamic = 1,

		SND_SOC_DAILINK_REG(echoref, dummy, platform),

sound/soc/intel/boards/kbl_da7219_max98927.c

+2 −2
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { 
		.name = "Kbl Audio Echo Reference cap",

		.stream_name = "Echoreference Capture",

		.init = NULL,

		.capture_only = 1,

		.dpcm_capture = 1,

		.nonatomic = 1,

		SND_SOC_DAILINK_REG(echoref, dummy, platform),

	},
@@ -858,7 +858,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { 
		.name = "Kbl Audio Echo Reference cap",

		.stream_name = "Echoreference Capture",

		.init = NULL,

		.capture_only = 1,

		.dpcm_capture = 1,

		.nonatomic = 1,

		SND_SOC_DAILINK_REG(echoref, dummy, platform),

	},

sound/soc/intel/boards/kbl_rt5663_max98927.c

+1 −1
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { 
		.name = "Kbl Audio Echo Reference cap",

		.stream_name = "Echoreference Capture",

		.init = NULL,

		.capture_only = 1,

		.dpcm_capture = 1,

		.nonatomic = 1,

		SND_SOC_DAILINK_REG(echoref, dummy, platform),

	},

sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c

+1 −1
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { 
		.name = "Kbl Audio Echo Reference cap",

		.stream_name = "Echoreference Capture",

		.init = NULL,

		.capture_only = 1,

		.dpcm_capture = 1,

		.nonatomic = 1,

		SND_SOC_DAILINK_REG(echoref, dummy, platform),

	},

sound/soc/soc-core.c

+19 −3
Original line number Diff line number Diff line
@@ -1648,9 +1648,25 @@ match: 
			dai_link->platforms->name = component->name;



			/* convert non BE into BE */

			if (!dai_link->no_pcm) {

				dai_link->no_pcm = 1;

			dai_link->dpcm_playback = 1;

			dai_link->dpcm_capture = 1;



				if (dai_link->dpcm_playback)

					dev_warn(card->dev,

						 "invalid configuration, dailink %s has flags no_pcm=0 and dpcm_playback=1\n",

						 dai_link->name);

				if (dai_link->dpcm_capture)

					dev_warn(card->dev,

						 "invalid configuration, dailink %s has flags no_pcm=0 and dpcm_capture=1\n",

						 dai_link->name);



				/* convert normal link into DPCM one */

				if (!(dai_link->dpcm_playback ||

				      dai_link->dpcm_capture)) {

					dai_link->dpcm_playback = !dai_link->capture_only;

					dai_link->dpcm_capture = !dai_link->playback_only;

				}

			}



			/*

			 * override any BE fixups

CRA Git | Maintained and supported by SUSTech CRA and CCSE