From 35e04312b501732b601ed3f7061016e1fedef0cc Mon Sep 17 00:00:00 2001 From: Asish Bhattacharya Date: Sun, 11 Aug 2019 08:47:47 +0530 Subject: [PATCH] ASoC: Allow switch to DLKM for 32bit targets To meet kernel Boot kpis switch entire sound to loadable module. Change-Id: I6612efbd28f7d2e4ef194a91791291ba9ff07144 Signed-off-by: Asish Bhattacharya --- arch/arm/Kconfig | 2 -- include/sound/soc.h | 2 -- sound/pci/Kconfig | 1 - sound/soc/Kconfig | 5 ++++- sound/usb/Kconfig | 1 - 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 628715e0a45d..8f70fb146026 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -573,8 +573,6 @@ config ARCH_QCOM select USE_OF select PINCTRL select ARCH_WANT_KMAP_ATOMIC_FLUSH - select SND_SOC_COMPRESS - select SND_HWDEP help Support for Qualcomm MSM/QSD based systems. This runs on the apps processor of the MSM/QSD and depends on a shared memory diff --git a/include/sound/soc.h b/include/sound/soc.h index 71fd43854dd2..d22578945fae 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -494,9 +494,7 @@ 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); -#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); diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 32151d8c6bb8..65fd60f12c19 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig @@ -3,7 +3,6 @@ menuconfig SND_PCI bool "PCI sound devices" depends on PCI - default y help Support for sound devices connected via the PCI bus. diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 182d92efc7c8..3cf139d1deaa 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -7,6 +7,9 @@ menuconfig SND_SOC select SND_PCM select AC97_BUS if SND_SOC_AC97_BUS select SND_JACK + select SND_TIMER + select SND_HWDEP + select SND_SOC_COMPRESS select REGMAP_I2C if I2C select REGMAP_SPI if SPI_MASTER ---help--- @@ -30,7 +33,7 @@ config SND_SOC_GENERIC_DMAENGINE_PCM select SND_DMAENGINE_PCM config SND_SOC_COMPRESS - bool + tristate select SND_COMPRESS_OFFLOAD config SND_SOC_TOPOLOGY diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig index f32cfa40c192..6838f2e0896a 100644 --- a/sound/usb/Kconfig +++ b/sound/usb/Kconfig @@ -11,7 +11,6 @@ if SND_USB && USB config SND_USB_AUDIO tristate "USB Audio/MIDI driver" - select SND_HWDEP select SND_RAWMIDI select SND_PCM select BITREVERSE