diff options
-rw-r--r-- | mk/modules.mk | 8 | ||||
-rw-r--r-- | target/arm/raspberry-pi/patches/3.12.33/0000-raspberry-pi.patch (renamed from target/arm/raspberry-pi/patches/3.12.33/raspberry-pi.patch) | 0 | ||||
-rw-r--r-- | target/linux/config/Config.in.audio | 20 |
3 files changed, 24 insertions, 4 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index 66e9833db..a8b9089bc 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1754,6 +1754,11 @@ $(eval $(call KMOD_template,DRM_DW_HDMI_CEC,drm-dw-hdmi-cec,\ # # Sound # + +$(eval $(call KMOD_template,SND_SOC_WM8731,snd-soc-wm8731,\ + $(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-wm8731 \ +,55)) + $(eval $(call KMOD_template,SND_SOC_WM8804,snd-soc-wm8804,\ $(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-wm8804 \ ,55)) @@ -1794,3 +1799,6 @@ $(eval $(call KMOD_template,SND_BCM2708_SOC_IQAUDIO_DAC,snd-bcm2708-soc-iqaudio- $(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-iqaudio-dac \ ,65, kmod-snd-bcm2708-soc-i2s)) +$(eval $(call KMOD_template,SND_BCM2708_SOC_RPI_CODEC_PROTO,snd-bcm2708-soc-rpi-proto,\ + $(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-rpi-proto \ +,65, kmod-snd-bcm2708-soc-i2s)) diff --git a/target/arm/raspberry-pi/patches/3.12.33/raspberry-pi.patch b/target/arm/raspberry-pi/patches/3.12.33/0000-raspberry-pi.patch index af972bb3e..af972bb3e 100644 --- a/target/arm/raspberry-pi/patches/3.12.33/raspberry-pi.patch +++ b/target/arm/raspberry-pi/patches/3.12.33/0000-raspberry-pi.patch diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index 7ff42afe9..d8888be5a 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -73,6 +73,10 @@ config ADK_KERNEL_SND_AC97_CODEC config ADK_KERNEL_SND_SOC_I2C_AND_SPI boolean +config ADK_KERNEL_SND_SOC_WM8731 + tristate + select ADK_KERNEL_SND_SOC_I2C_AND_SPI + config ADK_KERNEL_SND_SOC_WM8804 tristate select ADK_KERNEL_SND_SOC_I2C_AND_SPI @@ -185,7 +189,7 @@ config ADK_KERNEL_SND_BCM2708_SOC_I2S default n config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC - prompt "Raspberry PI hifiberry DAC" + prompt "Hifiberry DAC" tristate select ADK_KERNEL_SND_BCM2708_SOC_I2S select ADK_KERNEL_SND_SOC_PCM5102A @@ -193,7 +197,7 @@ config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC default n config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI - prompt "Raspberry PI hifiberry DIGI" + prompt "Hifiberry DIGI" tristate select ADK_KERNEL_SND_BCM2708_SOC_I2S select ADK_KERNEL_SND_SOC_WM8804 @@ -201,20 +205,28 @@ config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI default n config ADK_KERNEL_SND_BCM2708_SOC_RPI_DAC - prompt "Raspberry PI RPI-DAC" + prompt "RPI-DAC" 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" + prompt "IQAudio-DAC" tristate select ADK_KERNEL_SND_BCM2708_SOC_I2S select ADK_KERNEL_SND_SOC_PCM512x_I2C depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default n +config ADK_KERNEL_SND_BCM2708_SOC_RPI_CODEC_PROTO + prompt "Rpi-Codec-Proto" + tristate + select ADK_KERNEL_SND_BCM2708_SOC_I2S + select ADK_KERNEL_SND_SOC_WM8731 + depends on ADK_TARGET_SYSTEM_RASPBERRY_PI + default n + config ADK_KERNEL_SND_IMX_SOC prompt "Solidrun SoC sound chip" boolean |