Commit 188bdf72 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/adsp' and 'asoc/topic/amd' into asoc-next

parents 551e13a4 83a40ce9 7cb1dc81

include/sound/designware_i2s.h

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ struct i2s_platform_data { 
	u32 snd_rates;



	#define DW_I2S_QUIRK_COMP_REG_OFFSET	(1 << 0)

	#define DW_I2S_QUIRK_COMP_PARAM1	(1 << 1)

	unsigned int quirks;

	unsigned int i2s_reg_comp1;

	unsigned int i2s_reg_comp2;

sound/soc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ config SND_SOC_TOPOLOGY 


# All the supported SoCs

source "sound/soc/adi/Kconfig"

source "sound/soc/amd/Kconfig"

source "sound/soc/atmel/Kconfig"

source "sound/soc/au1x/Kconfig"

source "sound/soc/bcm/Kconfig"

sound/soc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ obj-$(CONFIG_SND_SOC) += snd-soc-core.o 
obj-$(CONFIG_SND_SOC)	+= codecs/

obj-$(CONFIG_SND_SOC)	+= generic/

obj-$(CONFIG_SND_SOC)	+= adi/

obj-$(CONFIG_SND_SOC)	+= amd/

obj-$(CONFIG_SND_SOC)	+= atmel/

obj-$(CONFIG_SND_SOC)	+= au1x/

obj-$(CONFIG_SND_SOC)	+= bcm/

sound/soc/amd/Kconfig

0 → 100644
+4 −0
Original line number Diff line number Diff line 
config SND_SOC_AMD_ACP

	tristate "AMD Audio Coprocessor support"

	help

	 This option enables ACP DMA support on AMD platform.

sound/soc/amd/Makefile

0 → 100644
+3 −0
Original line number Diff line number Diff line 
snd-soc-acp-pcm-objs	:= acp-pcm-dma.o



obj-$(CONFIG_SND_SOC_AMD_ACP) += snd-soc-acp-pcm.o