diff options
| author | Mark Brown <broonie@kernel.org> | 2020-07-20 15:34:31 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-07-20 15:34:31 +0100 |
| commit | 4d9e07cc41b837146ef39d99c8dad2a58326ae4a (patch) | |
| tree | 7dcbad9704e8c7211ef5fc444f168c31e75bc702 /include/sound | |
| parent | fc926a7c818c97e98c5c2db1cb910523df0419e5 (diff) | |
| parent | 58ef60025a1263e78de01b135d05784996383611 (diff) | |
Merge series "ASoC: Intel: machine driver updates for 5.9" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:
Small patchset to harden the SoundWire machine driver, change bad
HIDs, update PLL settings and avoid memory leaks. Given that the
SoundWire core parts are not upstream it's probably not necessary to
provide the patches to stable branches.
Bard Liao (1):
ASoC: Intel: sof_sdw_rt711: remove hard-coded codec name
Kai Vehmanen (2):
ASoC: Intel: sof_sdw: add support for systems without i915 audio
ASoC: Intel: sof_sdw: avoid crash if invalid DSP topology loaded
Libin Yang (1):
ASoC: Intel: common: change match table ehl-rt5660
Pierre-Louis Bossart (1):
ASoC: Intel: sof_sdw_rt711: remove properties in card remove
Yong Zhi (1):
ASoC: intel: board: sof_rt5682: Update rt1015 pll input clk freq
sound/soc/intel/boards/sof_rt5682.c | 9 +++++-
sound/soc/intel/boards/sof_sdw.c | 31 +++++++++++++------
sound/soc/intel/boards/sof_sdw_common.h | 2 ++
sound/soc/intel/boards/sof_sdw_hdmi.c | 6 ++++
sound/soc/intel/boards/sof_sdw_rt711.c | 17 +++++++++-
.../intel/common/soc-acpi-intel-ehl-match.c | 2 +-
6 files changed, 54 insertions(+), 13 deletions(-)
base-commit: 22e9b54307987787efa0ee534aa9e31982ec1161
--
2.25.1
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dai.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 7ff659e28570..776a60529e70 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -161,6 +161,7 @@ void snd_soc_dai_resume(struct snd_soc_dai *dai); int snd_soc_dai_compress_new(struct snd_soc_dai *dai, struct snd_soc_pcm_runtime *rtd, int num); bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream); +void snd_soc_dai_link_set_capabilities(struct snd_soc_dai_link *dai_link); void snd_soc_dai_action(struct snd_soc_dai *dai, int stream, int action); static inline void snd_soc_dai_activate(struct snd_soc_dai *dai, |