Merge remote-tracking branches 'asoc/topic/imx' and 'asoc/topic/intel' into asoc...

diff --combined sound/soc/intel/Kconfig
index 221e3bd73adb34e1cfaee60ba3979ca7d643c52d,05fde5e6e2578396aa4e4be20d84d3b35d3bc6ff,6d67357f2d74b4e5f9fb7d9ed68734c6ba2fce66..7b778ab85f8b41234487d0810f4c350f6dc09775
--- 1/sound/soc/intel/Kconfig
--- 2/sound/soc/intel/Kconfig
--- 3/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@@@ -12,7 -12,6 -12,6 +12,7 @@@@ config SND_MFLD_MACHIN
   
   config SND_SST_MFLD_PLATFORM
        tristate
 ++     select SND_SOC_COMPRESS
   
   config SND_SST_IPC
        tristate
@@@@ -139,4 -138,4 -138,18 +139,18 @@@@ config SND_SOC_INTEL_CHT_BSW_MAX98090_T
   config SND_SOC_INTEL_SKYLAKE
        tristate
        select SND_HDA_EXT_CORE
++      select SND_SOC_TOPOLOGY
        select SND_SOC_INTEL_SST
++ 
++ config SND_SOC_INTEL_SKL_RT286_MACH
++      tristate "ASoC Audio driver for SKL with RT286 I2S mode"
++      depends on X86 && ACPI
++      select SND_SOC_INTEL_SST
++      select SND_SOC_INTEL_SKYLAKE
++      select SND_SOC_RT286
++      select SND_SOC_DMIC
++      help
++         This adds support for ASoC machine driver for Skylake platforms
++         with RT286 I2S audio codec.
++         Say Y if you have such a device
++         If unsure select "N".