AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-25 16:50:53 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Brown 2013-08-22 14:28:37 +01:00
commit 7fc7d82fde
8 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/core/Kconfig
View File

@ -6,6 +6,9 @@ config SND_PCM
tristate
select SND_TIMER
config SND_DMAENGINE_PCM
tristate
config SND_HWDEP
tristate

3
sound/core/Makefile
View File

@ -13,6 +13,8 @@ snd-$(CONFIG_SND_JACK) += jack.o
snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \
pcm_memory.o
snd-pcm-dmaengine-objs := pcm_dmaengine.o
snd-page-alloc-y := memalloc.o
snd-page-alloc-$(CONFIG_SND_DMA_SGBUF) += sgbuf.o
@ -30,6 +32,7 @@ obj-$(CONFIG_SND_TIMER) += snd-timer.o
obj-$(CONFIG_SND_HRTIMER) += snd-hrtimer.o
obj-$(CONFIG_SND_RTCTIMER) += snd-rtctimer.o
obj-$(CONFIG_SND_PCM) += snd-pcm.o snd-page-alloc.o
obj-$(CONFIG_SND_DMAENGINE_PCM) += snd-pcm-dmaengine.o
obj-$(CONFIG_SND_RAWMIDI) += snd-rawmidi.o
obj-$(CONFIG_SND_OSSEMUL) += oss/

0
sound/soc/soc-dmaengine-pcm.c → sound/core/pcm_dmaengine.c
View File

5
sound/soc/Kconfig
View File

@ -26,12 +26,9 @@ if SND_SOC
config SND_SOC_AC97_BUS
bool
config SND_SOC_DMAENGINE_PCM
bool
config SND_SOC_GENERIC_DMAENGINE_PCM
bool
select SND_SOC_DMAENGINE_PCM
select SND_DMAENGINE_PCM
# All the supported SoCs
source "sound/soc/atmel/Kconfig"

4
sound/soc/Makefile
View File

@ -1,10 +1,6 @@
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
ifneq ($(CONFIG_SND_SOC_DMAENGINE_PCM),)
snd-soc-core-objs += soc-dmaengine-pcm.o
endif
ifneq ($(CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM),)
snd-soc-core-objs += soc-generic-dmaengine-pcm.o
endif

2
sound/soc/omap/Kconfig
View File

@ -1,7 +1,7 @@
config SND_OMAP_SOC
tristate "SoC Audio for the Texas Instruments OMAP chips"
depends on ARCH_OMAP && DMA_OMAP
select SND_SOC_DMAENGINE_PCM
select SND_DMAENGINE_PCM
config SND_OMAP_SOC_DMIC
tristate

2
sound/soc/pxa/Kconfig
View File

@ -11,7 +11,7 @@ config SND_PXA2XX_SOC
config SND_MMP_SOC
bool "Soc Audio for Marvell MMP chips"
depends on ARCH_MMP
select SND_SOC_DMAENGINE_PCM
select SND_DMAENGINE_PCM
select SND_ARM
help
Say Y if you want to add support for codecs attached to

2
sound/soc/spear/Kconfig
View File

@ -1,6 +1,6 @@
config SND_SPEAR_SOC
tristate
select SND_SOC_DMAENGINE_PCM
select SND_DMAENGINE_PCM
config SND_SPEAR_SPDIF_OUT
tristate