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

Browse source

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: 8a9144c1cf
--
2.20.1

...

This commit is contained in:

Mark Brown 2020-06-09 15:46:20 +01:00

parent 79d4f823a0 ba4e5abc6c

commit 44ce45f866

No known key found for this signature in database

GPG key ID: 24D68B725D5487D0

7 changed files with 62 additions and 20 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

sound/soc/intel/boards/glk_rt5682_max98357a.c

View file

4

sound/soc/intel/boards/kbl_da7219_max98927.c

View file

2

sound/soc/intel/boards/kbl_rt5663_max98927.c

View file

2

sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c

View file

22

sound/soc/soc-core.c

View file

46

sound/soc/soc-pcm.c

View file

6

sound/soc/sof/nocodec.c

View file