Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f0c4226 authored by Jie Yang's avatar Jie Yang Committed by Mark Brown
Browse files

ASoC: compress: add config item for soc-compress to make it compiled only when needed 



We don't always need soc-compress in soc, here add a config item
SND_SOC_COMPRESS, when nobody select it, the soc-compress will
not be compiled.

Here also change Kconfig to 'select SND_SOC_COMPRESS' for drivers
that needed soc-compress.

Signed-off-by: default avatarJie Yang <yang.jie@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 26d9ca34

include/sound/soc-dai.h

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ struct snd_soc_dai_driver { 
	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;

include/sound/soc.h

+3 −1
Original line number Diff line number Diff line
@@ -440,7 +440,9 @@ int snd_soc_platform_read(struct snd_soc_platform *platform, 
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);

sound/soc/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ menuconfig SND_SOC 
	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
@@ -30,6 +29,10 @@ config SND_SOC_GENERIC_DMAENGINE_PCM 
	bool

	select SND_DMAENGINE_PCM



config SND_SOC_COMPRESS

	bool

	select SND_COMPRESS_OFFLOAD



config SND_SOC_TOPOLOGY

	bool

sound/soc/Makefile

+2 −1
Original line number Diff line number Diff line 
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

sound/soc/intel/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ config SND_MFLD_MACHINE 


config SND_SST_MFLD_PLATFORM

	tristate

	select SND_SOC_COMPRESS



config SND_SST_IPC

	tristate