Browse Source

add hdmi audio support

Waldemar Brodkorb 10 years ago
parent
commit
2508a38a4a
2 changed files with 21 additions and 8 deletions
  1. 5 4
      mk/modules.mk
  2. 16 4
      target/linux/config/Config.in.graphics

+ 5 - 4
mk/modules.mk

@@ -1135,10 +1135,6 @@ $(eval $(call KMOD_template,DMA_BCM2708,dma-bcm2708,\
 	$(MODULES_DIR)/kernel/drivers/dma/bcm2708-dmaengine \
 ,25))
 
-$(eval $(call KMOD_template,SND_DMAENGINE_PCM,snd-dmaengine-pcm,\
-	$(MODULES_DIR)/kernel/sound/core/snd-pcm-dmaengine \
-,25))
-
 $(eval $(call KMOD_template,SOUND,sound,\
 	$(MODULES_DIR)/kernel/sound/soundcore \
 ,30))
@@ -1161,6 +1157,11 @@ $(eval $(call KMOD_template,SND_PCM,snd-pcm,\
 endif
 endif
 
+$(eval $(call KMOD_template,SND_DMAENGINE_PCM,snd-dmaengine-pcm,\
+	$(MODULES_DIR)/kernel/sound/core/snd-pcm-dmaengine \
+,45))
+
+
 $(eval $(call KMOD_template,SND_COMPRESS,snd-compress,\
 	$(MODULES_DIR)/kernel/sound/core/snd-compress \
 ,45))

+ 16 - 4
target/linux/config/Config.in.graphics

@@ -54,6 +54,12 @@ config ADK_KERNEL_FB_MXC_SYNC_PANEL
 config ADK_KERNEL_FB_MXC_HDMI
  	boolean
 
+config ADK_KERNEL_DRM_DW_HDMI_AUDIO
+	tristate
+
+config ADK_KERNEL_DRM_DW_HDMI_CEC
+	tristate
+
 config ADK_KERNEL_MFD_SM501
 	boolean
 
@@ -91,9 +97,6 @@ config ADK_KERNEL_DRM_VIVANTE
 config ADK_KERNEL_DRM_IMX_FB_HELPER
 	boolean
 
-config ADK_KERNEL_DRM_IMX_HDMI
-	boolean
-
 config ADK_KERNEL_DRM_IMX_PARALLEL_DISPLAY
 	boolean
 
@@ -144,6 +147,16 @@ config ADK_KERNEL_FB_VESA
  	help
 	 Framebuffer support for VirtualBox Emulator.
 
+config ADK_KERNEL_DRM_IMX_HDMI
+	tristate
+	select ADK_KERNEL_DRM_DW_HDMI_AUDIO
+	select ADK_KERNEL_DRM_DW_HDMI_CEC
+	depends on ADK_TARGET_SYSTEM_CUBOX_I
+	depends on ADK_KERNEL_VERSION_3_15
+	default m if ADK_TARGET_SYSTEM_CUBOX_I
+ 	default n
+ 	help
+	
 config ADK_KERNEL_DRM_IMX
 	prompt "Framebuffer support for Cubox-i"
 	boolean
@@ -151,7 +164,6 @@ config ADK_KERNEL_DRM_IMX
 	select ADK_KERNEL_DMA_CMA
 	select ADK_KERNEL_RESET_CONTROLLER
 	select ADK_KERNEL_DRM_IMX_FB_HELPER
-	select ADK_KERNEL_DRM_IMX_HDMI
 	select ADK_KERNEL_DRM_IMX_LDB
 	select ADK_KERNEL_DRM_IMX_TVE
 	select ADK_KERNEL_DRM_IMX_PARALLEL_DISPLAY