Merge tag 'asoc-v5.5-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

ASoC: More updates for v5.5

Some more development work for v5.5.  Highlights include:

 - More cleanups from Morimoto-san.
 - Trigger word detection for RT5677.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --cc drivers/pci/pci.c
Simple merge

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

diff --cc sound/soc/codecs/Kconfig
index 925e5f852348a82184e910ce7ae3b30566dd50e1,ec01e4f12a780d29fc1df03ab95d4a8bb1cf905b..4abf37b5083fb9093bd56fd93f59c3147f481f5a
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -676,10 -676,11 +676,11 @@@ config SND_SOC_L
         tristate
  
  config SND_SOC_DA7210
 -        tristate
 +      tristate
  
  config SND_SOC_DA7213
-       tristate
+       tristate "Dialog DA7213 CODEC"
+       depends on I2C
  
  config SND_SOC_DA7218
        tristate

diff --cc sound/soc/codecs/rt5677-spi.c
Simple merge

diff --cc sound/soc/intel/boards/Kconfig
Simple merge

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

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

diff --cc sound/soc/sof/intel/Kconfig
Simple merge

diff --cc sound/soc/sof/sof-pci-dev.c
Simple merge