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

	int (*suspend)(struct snd_soc_dai *dai);

	int (*resume)(struct snd_soc_dai *dai);

	/* compress dai */

	bool compress_dai;

	int (*compress_new)(struct snd_soc_pcm_runtime *rtd, int num);

	/* DAI is also used for the control bus */

	bool bus_control;

int snd_soc_platform_write(struct snd_soc_platform *platform,

					unsigned int reg, unsigned int val);

int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num);

int soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num);

#ifdef CONFIG_SND_SOC_COMPRESS

int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num);

#endif

struct snd_pcm_substream *snd_soc_get_dai_substream(struct snd_soc_card *card,

		const char *dai_link, int stream);

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_get_volsw_range(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_limit_volume(struct snd_soc_codec *codec,

int snd_soc_limit_volume(struct snd_soc_card *card,

	const char *name, int max);

int snd_soc_bytes_info(struct snd_kcontrol *kcontrol,

		       struct snd_ctl_elem_info *uinfo);

	select SND_JACK if INPUT=y || INPUT=SND

	select REGMAP_I2C if I2C

	select REGMAP_SPI if SPI_MASTER

	select SND_COMPRESS_OFFLOAD

	---help---

	  If you want ASoC support, you should say Y here and also to the

	bool

	select SND_DMAENGINE_PCM

config SND_SOC_COMPRESS

	bool

	select SND_COMPRESS_OFFLOAD

config SND_SOC_TOPOLOGY

	bool

snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o

snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o soc-devres.o soc-ops.o

snd-soc-core-objs += soc-pcm.o soc-io.o soc-devres.o soc-ops.o

snd-soc-core-$(CONFIG_SND_SOC_COMPRESS) += soc-compress.o

ifneq ($(CONFIG_SND_SOC_TOPOLOGY),)

snd-soc-core-objs += soc-topology.o

config SND_SST_MFLD_PLATFORM

	tristate

	select SND_SOC_COMPRESS

config SND_SST_IPC

	tristate