From f061a04dd39ef3942ec98f301707a77baa83e9f9 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 11 Oct 2014 14:32:03 -0500 Subject: rework audio driver loading on rpi seems that i2s driver does not behave correctly when builtin. Add back driver modules for audio boards on rpi. --- target/linux/config/Config.in.audio | 42 ++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 17 deletions(-) (limited to 'target/linux/config/Config.in.audio') diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index 594274c40..7ff42afe9 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -74,15 +74,25 @@ config ADK_KERNEL_SND_SOC_I2C_AND_SPI boolean config ADK_KERNEL_SND_SOC_WM8804 - boolean + tristate select ADK_KERNEL_SND_SOC_I2C_AND_SPI config ADK_KERNEL_SND_SOC_PCM5102A - boolean + tristate + select ADK_KERNEL_SND_SOC_I2C_AND_SPI + +config ADK_KERNEL_SND_SOC_PCM512x + tristate select ADK_KERNEL_SND_SOC_I2C_AND_SPI config ADK_KERNEL_SND_SOC_PCM512x_I2C - boolean + tristate + select ADK_KERNEL_SND_SOC_PCM512x + select ADK_KERNEL_SND_SOC_I2C_AND_SPI + +config ADK_KERNEL_SND_SOC_PCM512x_SPI + tristate + select ADK_KERNEL_SND_SOC_PCM512x select ADK_KERNEL_SND_SOC_I2C_AND_SPI config ADK_KERNEL_SND_PCM_DMAENGINE @@ -161,11 +171,13 @@ config ADK_KERNEL_SND_BCM2835 default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default n -config ADK_KERNEL_SND_BCM2835_SOC_I2S - boolean +config ADK_KERNEL_SND_BCM2708_SOC_I2S + tristate select ADK_KERNEL_SND select ADK_KERNEL_SND_ARM select ADK_KERNEL_SND_SOC + select ADK_KERNEL_SND_BCM2835 + select ADK_KERNEL_DMA_BCM2835 select ADK_KERNEL_SND_DMAENGINE_PCM select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM select ADK_KERNEL_REGMAP_MMIO @@ -174,35 +186,31 @@ config ADK_KERNEL_SND_BCM2835_SOC_I2S config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC prompt "Raspberry PI hifiberry DAC" - boolean - select ADK_KERNEL_DMA_BCM2708 - select ADK_KERNEL_SND_BCM2835_SOC_I2S + tristate + select ADK_KERNEL_SND_BCM2708_SOC_I2S select ADK_KERNEL_SND_SOC_PCM5102A depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default n config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI prompt "Raspberry PI hifiberry DIGI" - boolean - select ADK_KERNEL_DMA_BCM2708 - select ADK_KERNEL_SND_BCM2835_SOC_I2S + tristate + 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" - boolean - select ADK_KERNEL_DMA_BCM2708 - select ADK_KERNEL_SND_BCM2835_SOC_I2S + tristate + 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" - boolean - select ADK_KERNEL_DMA_BCM2708 - select ADK_KERNEL_SND_BCM2835_SOC_I2S + tristate + select ADK_KERNEL_SND_BCM2708_SOC_I2S select ADK_KERNEL_SND_SOC_PCM512x_I2C depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default n -- cgit v1.2.3