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

ASoC: Updates for v5.5

Some big changes in the core but more about cleanps and refactorings
than new features, plus a collection of new drivers and lots of small
fixes and improvements to existing ones.

 - Lots more cleanups from Morimoto-san.  Now that everything is a
   component this is mostly about refactorings to clarify and simplify
   the core, a combination of things that are no longer required due to
   refactorings and spotting similarities.
 - Many fixes to the Sound Open Firmware code.
 - Wake on voice support for Chromebooks.
 - SPI support for RT5677.
 - New drivers for Analog Devices ADAU7118, Intel Cannonlake systems
   with RT1011 and RT5682, Texas Instruments TAS2562 and TAS2770.

diff --cc MAINTAINERS
Simple merge

diff --cc sound/pci/hda/patch_hdmi.c
Simple merge

diff --cc sound/soc/codecs/Kconfig
Simple merge

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

diff --cc sound/soc/intel/boards/Kconfig
index 882ff36a7c9c1d52a662835cefa1f630f8c3e0b2,dfa2c365379fff2c65af252867d2609f1335f800..2702aefee7758bd8af25ab9d342286d65546002e
--- 1/sound/soc/intel/boards/Kconfig
--- 2/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@@ -311,20 -313,21 +313,21 @@@ config SND_SOC_INTEL_KBL_RT5663_MAX9892
          If unsure select "N".
  
  config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
 -        tristate "KBL with RT5663, RT5514 and MAX98927 in I2S Mode"
 +      tristate "KBL with RT5663, RT5514 and MAX98927 in I2S Mode"
        depends on I2C && ACPI
        depends on MFD_INTEL_LPSS || COMPILE_TEST
 -        depends on SPI
 -        select SND_SOC_RT5663
 -        select SND_SOC_RT5514
 -        select SND_SOC_RT5514_SPI
 -        select SND_SOC_MAX98927
 -        select SND_SOC_HDAC_HDMI
 +      depends on SPI
 +      select SND_SOC_RT5663
 +      select SND_SOC_RT5514
 +      select SND_SOC_RT5514_SPI
 +      select SND_SOC_MAX98927
 +      select SND_SOC_HDAC_HDMI
+       select SND_SOC_INTEL_SKYLAKE_SSP_CLK
 -        help
 -          This adds support for ASoC Onboard Codec I2S machine driver. This will
 -          create an alsa sound card for RT5663 + RT5514 + MAX98927.
 -          Say Y or m if you have such a device. This is a recommended option.
 -          If unsure select "N".
 +      help
 +        This adds support for ASoC Onboard Codec I2S machine driver. This will
 +        create an alsa sound card for RT5663 + RT5514 + MAX98927.
 +        Say Y or m if you have such a device. This is a recommended option.
 +        If unsure select "N".
  
  config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH
        tristate "KBL with DA7219 and MAX98357A in I2S Mode"

diff --cc sound/soc/sof/imx/Kconfig
index 6315fba8ce719c62b0c7f77cf7719720d8e6b5e8,71f318bc2c74f9a7f62b28f97ccf3b424eba2446..bae4f7bf5f75cc7ada5791d07d3b62e592e172ff
--- 1/sound/soc/sof/imx/Kconfig
--- 2/sound/soc/sof/imx/Kconfig
+++ b/sound/soc/sof/imx/Kconfig
@@@ -16,8 -16,12 +16,12 @@@ config SND_SOC_SOF_IMX8_SUPPOR
        depends on IMX_SCU
        depends on IMX_DSP
        help
 -          This adds support for Sound Open Firmware for NXP i.MX8 platforms
 -          Say Y if you have such a device.
 -          If unsure select "N".
 +        This adds support for Sound Open Firmware for NXP i.MX8 platforms
 +        Say Y if you have such a device.
 +        If unsure select "N".
  
+ config SND_SOC_SOF_IMX8
+       def_tristate SND_SOC_SOF_OF
+       depends on SND_SOC_SOF_IMX8_SUPPORT
+ 
  endif ## SND_SOC_SOF_IMX_IMX_TOPLEVEL

diff --cc sound/soc/sof/intel/Kconfig
index 05f4aed13af9f0068a8ff362bfd8ca6a1837a9b7,04d4929cf91f661bf398d63c24680461213dd8ce..b27fd3fdf335d714eb85f17ca606eb62df86115f
--- 1/sound/soc/sof/intel/Kconfig
--- 2/sound/soc/sof/intel/Kconfig
+++ b/sound/soc/sof/intel/Kconfig
@@@ -241,9 -258,24 +258,24 @@@ config SND_SOC_SOF_ELKHARTLAK
        tristate
        select SND_SOC_SOF_HDA_COMMON
        help
 -          This option is not user-selectable but automagically handled by
 +        This option is not user-selectable but automagically handled by
          'select' statements at a higher level
  
+ config SND_SOC_SOF_JASPERLAKE_SUPPORT
+       bool "SOF support for JasperLake"
+       help
+           This adds support for Sound Open Firmware for Intel(R) platforms
+           using the JasperLake processors.
+           Say Y if you have such a device.
+           If unsure select "N".
+ 
+ config SND_SOC_SOF_JASPERLAKE
+       tristate
+       select SND_SOC_SOF_HDA_COMMON
+       help
+           This option is not user-selectable but automagically handled by
+         'select' statements at a higher level
+ 
  config SND_SOC_SOF_HDA_COMMON
        tristate
        select SND_SOC_SOF_INTEL_COMMON

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