kernel: fix the pcspkr module, add proper dependencies, add the actual sound module

[openwrt/openwrt.git] / package / kernel / modules / sound.mk

diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk
index 1d2190f24770b6c0f606df46f5ce6ac467732921..3d12ba650ffaaa9f86a6339efc80593042c624d0 100644 (file)
--- a/package/kernel/modules/sound.mk
+++ b/package/kernel/modules/sound.mk
@@ -7,21 +7,6 @@
 
 SOUND_MENU:=Sound Support
 
-define KernelPackage/pcspkr
-  SUBMENU:=$(SOUND_MENU)
-  TITLE:=PC speaker support
-  KCONFIG:=CONFIG_INPUT_PCSPKR
-  FILES:=$(LINUX_DIR)/drivers/input/misc/pcspkr.ko
-  AUTOLOAD:=$(call AutoLoad,50,pcspkr)
-endef
-
-define KernelPackage/pcspkr/description
- This enables sounds (tones) through the pc speaker
-endef
-
-$(eval $(call KernelPackage,pcspkr))
-
-
 # allow targets to override the soundcore stuff
 SOUNDCORE_LOAD ?= \
        soundcore \
@@ -172,53 +157,53 @@ endef
 $(eval $(call KernelPackage,sound-soc-core))
 
 
-define KernelPackage/sound-soc-omap
-  TITLE:=OMAP SoC sound support
-  KCONFIG:= \
-       CONFIG_SND_OMAP_SOC
-  FILES:=$(LINUX_DIR)/sound/soc/omap/snd-soc-omap.ko
-  AUTOLOAD:=$(call AutoLoad,60,snd-soc-omap)
-  DEPENDS:=@TARGET_omap24xx +kmod-sound-soc-core
+define KernelPackage/sound-soc-ac97
+  TITLE:=AC97 Codec support
+  KCONFIG:=CONFIG_SND_SOC_AC97_CODEC
+  FILES:=$(LINUX_DIR)/sound/soc/codecs/snd-soc-ac97.ko
+  AUTOLOAD:=$(call AutoLoad,57,snd-soc-ac97)
+  DEPENDS:=+kmod-ac97 +kmod-sound-soc-core
   $(call AddDepends/sound)
 endef
 
-$(eval $(call KernelPackage,sound-soc-omap))
+$(eval $(call KernelPackage,sound-soc-ac97))
 
 
-define KernelPackage/sound-soc-omap-mcbsp
-  TITLE:=OMAP SoC MCBSP support
+define KernelPackage/sound-soc-gw_avila
+  TITLE:=Gateworks Avila SoC sound support
   KCONFIG:= \
-       CONFIG_SND_OMAP_SOC_MCBSP
-  FILES:=$(LINUX_DIR)/sound/soc/omap/snd-soc-omap-mcbsp.ko
-  AUTOLOAD:=$(call AutoLoad,61,snd-soc-omap-mcbsp)
-  DEPENDS:=@TARGET_omap24xx +kmod-sound-soc-omap
+       CONFIG_SND_GW_AVILA_SOC \
+       CONFIG_SND_GW_AVILA_SOC_PCM \
+       CONFIG_SND_GW_AVILA_SOC_HSS
+  FILES:= \
+       $(LINUX_DIR)/sound/soc/codecs/snd-soc-tlv320aic3x.ko \
+       $(LINUX_DIR)/sound/soc/gw-avila/snd-soc-gw-avila.ko \
+       $(LINUX_DIR)/sound/soc/gw-avila/snd-soc-gw-avila-pcm.ko \
+       $(LINUX_DIR)/sound/soc/gw-avila/snd-soc-gw-avila-hss.ko
+  AUTOLOAD:=$(call AutoLoad,65,snd-soc-tlv320aic3x snd-soc-gw-avila snd-soc-gw-avila-pcm snd-soc-gw-avila-hss)
+  DEPENDS:=@TARGET_ixp4xx +kmod-sound-soc-core
   $(call AddDepends/sound)
 endef
 
-$(eval $(call KernelPackage,sound-soc-omap-mcbsp))
+$(eval $(call KernelPackage,sound-soc-gw_avila))
 
 
-define KernelPackage/sound-soc-n810
-  TITLE:=Nokia n810 SoC sound support
+define KernelPackage/pcspkr
+  DEPENDS:=@!TARGET_x86
+  TITLE:=PC speaker support
   KCONFIG:= \
-       CONFIG_SND_OMAP_SOC_N810
+       CONFIG_INPUT_PCSPKR \
+       CONFIG_SND_PCSP
   FILES:= \
-       $(LINUX_DIR)/sound/soc/codecs/snd-soc-tlv320aic3x.ko \
-       $(LINUX_DIR)/sound/soc/omap/snd-soc-n810.ko
-  AUTOLOAD:=$(call AutoLoad,65,snd-soc-tlv320aic3x snd-soc-n810)
-  DEPENDS:=@TARGET_omap24xx +kmod-sound-soc-omap +kmod-sound-soc-omap-mcbsp
+       $(LINUX_DIR)/drivers/input/misc/pcspkr.ko \
+       $(LINUX_DIR)/sound/drivers/pcsp/snd-pcsp.ko
+  AUTOLOAD:=$(call AutoLoad,50,pcspkr snd-pcsp)
+  $(call AddDepends/input)
   $(call AddDepends/sound)
 endef
 
-$(eval $(call KernelPackage,sound-soc-n810))
-
-define KernelPackage/sound-soc-ac97
-  TITLE:=AC97 Codec support
-  KCONFIG:=CONFIG_SND_SOC_AC97_CODEC
-  FILES:=$(LINUX_DIR)/sound/soc/codecs/snd-soc-ac97.ko
-  AUTOLOAD:=$(call AutoLoad,57,snd-soc-ac97)
-  DEPENDS:=+kmod-ac97 +kmod-sound-soc-core
-  $(call AddDepends/sound)
+define KernelPackage/pcspkr/description
+ This enables sounds (tones) through the pc speaker
 endef
 
-$(eval $(call KernelPackage,sound-soc-ac97))
+$(eval $(call KernelPackage,pcspkr))