fix some audio driver stuff, add more dacs for rpi

2 files changed, 53 insertions, 7 deletions

diff --git a/mk/modules.mk b/mk/modules.mk
index f0c3dcc8d..3d881adb8 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1198,6 +1198,13 @@ $(eval $(call KMOD_template,SND_AC97_CODEC,snd-ac97-codec,\
 	$(MODULES_DIR)/kernel/sound/pci/ac97/snd-ac97-codec \
 ,55))
 
+$(eval $(call KMOD_template,SND_SOC_WM8804,snd-soc-wm8804,\
+	$(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-wm8804 \
+,55))
+
+$(eval $(call KMOD_template,SND_SOC_PCM5102A,snd-soc-pcm5102a,\
+	$(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-pcm5102a \
+,55))
 
 ifeq ($(KERNEL_BASE),3)
 ifeq ($(KERNEL_MAJ),10)
@@ -1245,18 +1252,26 @@ $(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\
 	$(MODULES_DIR)/kernel/sound/arm/snd-bcm2835 \
 ,60))
 
-$(eval $(call KMOD_template,SND_BCM2708_SOC_I2S,snd-bcm2709-soc-i2s,\
-	$(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-pcm5102a \
+$(eval $(call KMOD_template,SND_BCM2708_SOC_I2S,snd-bcm2708-soc-i2s,\
 	$(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-bcm2708-i2s \
-,60, kmod-snd-soc))
+,60, kmod-snd-soc kmod-snd-soc-pcm5102a))
 
-$(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DAC,snd-bcm2709-soc-hifiberry-dac,\
+$(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DAC,snd-bcm2708-soc-hifiberry-dac,\
 	$(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-hifiberry-dac \
-,65, kmod-snd-bcm2709-soc-i2s))
+,65, kmod-snd-bcm2708-soc-i2s))
 
-$(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DIGI,snd-bcm2709-soc-hifiberry-digi,\
+$(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DIGI,snd-bcm2708-soc-hifiberry-digi,\
 	$(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-hifiberry-digi \
-,65, kmod-snd-bcm2709-soc-i2s))
+,65, kmod-snd-bcm2708-soc-i2s))
+
+$(eval $(call KMOD_template,SND_BCM2708_SOC_RPI_DAC,snd-bcm2708-soc-rpi-dac,\
+	$(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-rpi-dac \
+,65, kmod-snd-bcm2708-soc-i2s))
+
+$(eval $(call KMOD_template,SND_BCM2708_SOC_IQAUDIO_DAC,snd-bcm2708-soc-iqaudio-dac,\
+	$(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-iqaudio-dac \
+,65, kmod-snd-bcm2708-soc-i2s))
+
 
 $(eval $(call KMOD_template,USB_VIDEO_CLASS,usb-video-class,\
 	$(MODULES_DIR)/kernel/drivers/media/usb/uvc/uvcvideo \
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index f01b381ec..45223956f 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -61,6 +61,17 @@ config ADK_KERNEL_SND_RAWMIDI
 config ADK_KERNEL_SND_AC97_CODEC
 	tristate
 
+config ADK_KERNEL_SND_SOC_I2C_AND_SPI
+	boolean
+
+config ADK_KERNEL_SND_SOC_WM8804
+	tristate
+	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
+
+config ADK_KERNEL_SND_SOC_PCM5102A
+	tristate
+	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
+
 config ADK_KERNEL_SND_PCM_DMAENGINE
 	tristate
 
@@ -151,6 +162,7 @@ config ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
 	select ADK_KERNEL_SND_COMPRESS
 	select ADK_KERNEL_REGMAP_MMIO
+	select ADK_KERNEL_SND_SOC_PCM5102A
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
@@ -169,6 +181,25 @@ config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI
 	select ADK_KERNEL_DMA_BCM2708
 	select ADK_KERNEL_REGMAP_MMIO
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
+	select ADK_KERNEL_SND_SOC_WM8804
+	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default n
+
+config ADK_KERNEL_SND_BCM2708_SOC_RPI_DAC
+	prompt "Raspberry PI RPI-DAC"
+	tristate
+	select ADK_KERNEL_DMA_BCM2708
+	select ADK_KERNEL_REGMAP_MMIO
+	select ADK_KERNEL_SND_BCM2708_SOC_I2S
+	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default n
+
+config ADK_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC
+	prompt "Raspberry PI IQAudio-DAC"
+	tristate
+	select ADK_KERNEL_DMA_BCM2708
+	select ADK_KERNEL_REGMAP_MMIO
+	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n