]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge series "ASoC: Fix dailink checks for DPCM" from Pierre-Louis Bossart <pierre...
authorMark Brown <broonie@kernel.org>
Tue, 9 Jun 2020 14:46:20 +0000 (15:46 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 9 Jun 2020 14:46:20 +0000 (15:46 +0100)
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: 8a9144c1cf523221b37dd3393827253c91fcbf54
--
2.20.1


Trivial merge