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 /sound/soc/intel | |
| 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 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/boards/bdw-rt5677.c | 1 | ||||
| -rw-r--r-- | sound/soc/intel/boards/bytcht_es8316.c | 4 | ||||
| -rw-r--r-- | sound/soc/intel/common/soc-acpi-intel-ehl-match.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/sound/soc/intel/boards/bdw-rt5677.c b/sound/soc/intel/boards/bdw-rt5677.c index c9da91147770..725304779426 100644 --- a/sound/soc/intel/boards/bdw-rt5677.c +++ b/sound/soc/intel/boards/bdw-rt5677.c @@ -367,6 +367,7 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { { .name = "Codec DSP", .stream_name = "Wake on Voice", + .capture_only = 1, .ops = &bdw_rt5677_dsp_ops, SND_SOC_DAILINK_REG(dsp), }, diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index 71b39e579af9..414ae4bb5224 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -552,8 +552,10 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) if (cnt) { ret = device_add_properties(codec_dev, props); - if (ret) + if (ret) { + put_device(codec_dev); return ret; + } } devm_acpi_dev_add_driver_gpios(codec_dev, byt_cht_es8316_gpios); diff --git a/sound/soc/intel/common/soc-acpi-intel-ehl-match.c b/sound/soc/intel/common/soc-acpi-intel-ehl-match.c index 45e07d886013..badafc1d54d2 100644 --- a/sound/soc/intel/common/soc-acpi-intel-ehl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-ehl-match.c @@ -12,7 +12,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ehl_machines[] = { { - .id = "INTC1027", + .id = "10EC5660", .drv_name = "ehl_rt5660", .sof_fw_filename = "sof-ehl.ri", .sof_tplg_filename = "sof-ehl-rt5660.tplg", |