Merge series "ASoC: Intel: machine driver updates for 5.9" from Pierre-Louis Bossart...

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

diff --cc include/sound/soc-dai.h
Simple merge

diff --cc sound/soc/codecs/max98373.c
Simple merge

diff --cc sound/soc/codecs/rt286.c
Simple merge

diff --cc sound/soc/codecs/rt5682.c
index fab066a,d503b5b..a4713bd
--- 1/sound/soc/codecs/rt5682.c
--- 2/sound/soc/codecs/rt5682.c
+++ b/sound/soc/codecs/rt5682.c
@@@ -970,18 -967,14 +970,17 @@@ int rt5682_headset_detect(struct snd_so
                rt5682_enable_push_button_irq(component, false);
                snd_soc_component_update_bits(component, RT5682_CBJ_CTRL_1,
                        RT5682_TRIG_JD_MASK, RT5682_TRIG_JD_LOW);
-               if (snd_soc_dapm_get_pin_status(dapm, "MICBIAS"))
+               if (!snd_soc_dapm_get_pin_status(dapm, "MICBIAS"))
                        snd_soc_component_update_bits(component,
-                               RT5682_PWR_ANLG_1, RT5682_PWR_VREF2, 0);
-               else
+                               RT5682_PWR_ANLG_1, RT5682_PWR_MB, 0);
+               if (!snd_soc_dapm_get_pin_status(dapm, "Vref2"))
                        snd_soc_component_update_bits(component,
-                               RT5682_PWR_ANLG_1,
-                               RT5682_PWR_VREF2 | RT5682_PWR_MB, 0);
+                               RT5682_PWR_ANLG_1, RT5682_PWR_VREF2, 0);
                snd_soc_component_update_bits(component, RT5682_PWR_ANLG_3,
                        RT5682_PWR_CBJ, 0);
 +              snd_soc_component_update_bits(component, RT5682_MICBIAS_2,
 +                      RT5682_PWR_CLK25M_MASK | RT5682_PWR_CLK1M_MASK,
 +                      RT5682_PWR_CLK25M_PD | RT5682_PWR_CLK1M_PD);
  
                rt5682->jack_type = 0;
        }

diff --cc sound/soc/codecs/wm8974.c
Simple merge

diff --cc sound/soc/intel/boards/bdw-rt5677.c
Simple merge

diff --cc sound/soc/intel/boards/bytcht_es8316.c
Simple merge

diff --cc sound/soc/soc-dai.c
Simple merge