Skip to content

ASoC: SOF: Make ALSA compress support optional #378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plbossart merged 1 commit into from
Dec 6, 2018
Merged

ASoC: SOF: Make ALSA compress support optional #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion sound/soc/sof/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,21 @@ config SND_SOC_SOF_SPI
config SND_SOC_SOF
tristate "Sound Open Firmware Support"
select SND_SOC_TOPOLOGY
select SND_SOC_COMPRESS
help
This adds support for Sound Open Firmware (SOF). SOF is a free and
generic open source audio DSP firmware for multiple devices.
Say Y if you have such a device that is supported by SOF.
If unsure select "N".

config SND_SOC_SOF_COMPRESS
tristate "SOF ALSA Compressed API support"
depends on SND_SOC_SOF
select SND_SOC_COMPRESS
help
This adds support for the ALSA compressed API in SOF
Say Y if you need this option
If unsure select "N".

config SND_SOC_SOF_NOCODEC
tristate "SOF nocodec mode Support"
depends on SND_SOC_SOF
Expand Down
4 changes: 3 additions & 1 deletion sound/soc/sof/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@
ccflags-y += -DDEBUG

snd-sof-objs := core.o ops.o loader.o ipc.o pcm.o pm.o debug.o topology.o\
control.o trace.o compressed.o utils.o
control.o trace.o utils.o
snd-sof-spi-objs := hw-spi.o

snd-sof-pci-objs := sof-pci-dev.o
snd-sof-acpi-objs := sof-acpi-dev.o
snd-sof-nocodec-objs := nocodec.o
snd-sof-compress-objs := compressed.o

obj-$(CONFIG_SND_SOC_SOF) += snd-sof.o
obj-$(CONFIG_SND_SOC_SOF_NOCODEC) += snd-sof-nocodec.o
obj-$(CONFIG_SND_SOC_SOF_COMPRESS) += snd-sof-compress.o

obj-$(CONFIG_SND_SOC_SOF_ACPI) += sof-acpi-dev.o
obj-$(CONFIG_SND_SOC_SOF_PCI) += sof-pci-dev.o
Expand Down
1 change: 1 addition & 0 deletions sound/soc/sof/compressed.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,3 +185,4 @@ struct snd_compr_ops sof_compressed_ops = {
.get_caps = sof_compressed_get_caps,
.get_codec_caps = sof_compressed_get_codec_caps,
};
EXPORT_SYMBOL(sof_compressed_ops);
2 changes: 2 additions & 0 deletions sound/soc/sof/pcm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,9 @@ void snd_sof_new_platform_drv(struct snd_sof_dev *sdev)
pd->probe = sof_pcm_probe;
pd->remove = sof_pcm_remove;
pd->ops = &sof_pcm_ops;
#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMPRESS)
pd->compr_ops = &sof_compressed_ops;
#endif
pd->pcm_new = sof_pcm_new;
pd->pcm_free = sof_pcm_free;
pd->ignore_machine = drv_name;
Expand Down