summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk')
-rw-r--r--mk/kernel-ver.mk6
-rw-r--r--mk/modules.mk21
2 files changed, 22 insertions, 5 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index ef9fee277..28f20dd24 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -4,11 +4,11 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
KERNEL_RELEASE:= 1
KERNEL_MD5SUM:= 345f5883cfb906dac4aef87e303d3a2d
endif
-ifeq ($(ADK_KERNEL_VERSION_3_13_5),y)
-KERNEL_VERSION:= 3.13.5
+ifeq ($(ADK_KERNEL_VERSION_3_13_6),y)
+KERNEL_VERSION:= 3.13.6
KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
KERNEL_RELEASE:= 1
-KERNEL_MD5SUM:= b9fa20262a7ecbbc3277aa2ee10412da
+KERNEL_MD5SUM:= 445aa27da818617409982f42902a6e41
endif
ifeq ($(ADK_KERNEL_VERSION_3_12_13),y)
KERNEL_VERSION:= 3.12.13
diff --git a/mk/modules.mk b/mk/modules.mk
index 00667de3e..32c9fe05c 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1198,8 +1198,11 @@ $(eval $(call KMOD_template,SND_CS5535AUDIO,snd-cs5535audio,\
$(MODULES_DIR)/kernel/sound/pci/cs5535audio/snd-cs5535audio \
,55))
-$(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\
+$(eval $(call KMOD_template,SND_SOC,snd-soc,\
$(MODULES_DIR)/kernel/sound/soc/snd-soc-core \
+,54))
+
+$(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\
$(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-lib \
$(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-pcm \
$(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-ac97 \
@@ -1207,12 +1210,26 @@ $(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\
$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-pxa2xx-i2s \
$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-pxa2xx \
$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-spitz \
-,55))
+,55, kmod-snd-soc))
$(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\
$(MODULES_DIR)/kernel/sound/arm/snd-bcm2835 \
,55))
+$(eval $(call KMOD_template,SND_BCM2708_SOC_I2S,snd-bcm2709-soc-i2s,\
+ $(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-pcm5102a \
+ $(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-wm8804 \
+ $(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-bcm2708-i2s \
+,55, kmod-snd-soc))
+
+$(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DAC,snd-bcm2709-soc-hifiberry-dac,\
+ $(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-hifiberry-dac \
+,56, kmod-snd-bcm2709-soc-i2s))
+
+$(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DAC,snd-bcm2709-soc-hifiberry-dac,\
+ $(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-hifiberry-digi \
+,56, kmod-snd-bcm2709-soc-i2s))
+
#ifeq ($(ADK_LINUX_64),y)
#V4L_COMPAT:=drivers/media/video/v4l2-compat-ioctl32
#endif