Merge remote-tracking branch 'asoc/topic/intel' into asoc-next

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

diff --cc sound/soc/Makefile
Simple merge

diff --cc sound/soc/intel/Makefile
index 62f37ff,9105594..b973d45
--- 1/sound/soc/intel/Makefile
--- 2/sound/soc/intel/Makefile
+++ b/sound/soc/intel/Makefile
@@@ -1,6 -1,5 +1,6 @@@
 +# SPDX-License-Identifier: GPL-2.0
  # Core support
- obj-$(CONFIG_SND_SOC_INTEL_SST) += common/
+ obj-$(CONFIG_SND_SOC_INTEL_COMMON) += common/
  
  # Platform Support
  obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += haswell/

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

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

diff --cc sound/soc/intel/common/Makefile
index 0e029f3,cb29653..7379d88
--- 1/sound/soc/intel/common/Makefile
--- 2/sound/soc/intel/common/Makefile
+++ b/sound/soc/intel/common/Makefile
@@@ -1,9 -1,8 +1,9 @@@
 +# SPDX-License-Identifier: GPL-2.0
  snd-soc-sst-dsp-objs := sst-dsp.o
  snd-soc-sst-acpi-objs := sst-acpi.o
- snd-soc-sst-match-objs := sst-match-acpi.o
  snd-soc-sst-ipc-objs := sst-ipc.o
  snd-soc-sst-firmware-objs := sst-firmware.o
+ snd-soc-acpi-intel-match-objs := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-match.o soc-acpi-intel-hsw-bdw-match.o
  
  obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o snd-soc-sst-ipc.o
  obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o

diff --cc sound/soc/intel/skylake/skl-messages.c
Simple merge

diff --cc sound/soc/intel/skylake/skl-pcm.c
Simple merge

diff --cc sound/soc/intel/skylake/skl-topology.c
Simple merge

diff --cc sound/soc/intel/skylake/skl-topology.h
Simple merge