]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitc6ba63a2d0112c4f50a0dda6ea019e96e8c63d83
tree583edf55c65a9d572f3967a4cb473fa3367970a3
parent14ae2fa49ca511acbb88853e4a80f7b8b9ec440a
parentfd18ffbfcc2e207633ee10f87c11b02958a7b8c2
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: caae0320b883c84d324a8b76810cbe3c770876c2
--
2.20.1