Adjust codec driver module name for 2.6.35

SVN-Revision: 22483
This commit is contained in:
Lars-Peter Clausen 2010-08-04 13:31:45 +00:00
parent 8ea976509c
commit 75a7e3e55a
5 changed files with 18 additions and 8 deletions

View file

@ -295,7 +295,6 @@ CONFIG_SCSI_MOD=y
# CONFIG_SIBYTE_SENTOSA is not set # CONFIG_SIBYTE_SENTOSA is not set
# CONFIG_SIBYTE_SWARM is not set # CONFIG_SIBYTE_SWARM is not set
# CONFIG_SND_SOC_ALL_CODECS is not set # CONFIG_SND_SOC_ALL_CODECS is not set
# CONFIG_SND_SOC_JZCODEC is not set
# CONFIG_SND_SOC_JZ4740 is not set # CONFIG_SND_SOC_JZ4740 is not set
# CONFIG_SND_JZ4740_SOC_N516 is not set # CONFIG_SND_JZ4740_SOC_N516 is not set
# CONFIG_SND_JZ4740_SOC_N526 is not set # CONFIG_SND_JZ4740_SOC_N526 is not set

View file

@ -6,14 +6,24 @@ define KernelPackage/sound-soc-jz4740
SUBMENU:=$(SOUND_MENU) SUBMENU:=$(SOUND_MENU)
DEPENDS:=kmod-sound-soc-core @TARGET_xburst DEPENDS:=kmod-sound-soc-core @TARGET_xburst
TITLE:=JZ4740 SoC sound support TITLE:=JZ4740 SoC sound support
KCONFIG:=CONFIG_SND_JZ4740_SOC CONFIG_SND_JZ4740_SOC_I2S @TARGET_xburst KCONFIG:=CONFIG_SND_JZ4740_SOC CONFIG_SND_JZ4740_SOC_I2S
FILES:= \ FILES:= \
$(LINUX_DIR)/sound/soc/jz4740/snd-soc-jz4740.ko \ $(LINUX_DIR)/sound/soc/jz4740/snd-soc-jz4740.ko \
$(LINUX_DIR)/sound/soc/jz4740/snd-soc-jz4740-i2s.ko $(LINUX_DIR)/sound/soc/jz4740/snd-soc-jz4740-i2s.ko
AUTOLOAD:=$(call AutoLoad,60,snd-soc-jz4740 snd-soc-jz4740-i2s) AUTOLOAD:=$(call AutoLoad,60,snd-soc-jz4740 snd-soc-jz4740-i2s)
endef endef
define KernelPackage/sound-soc-jzcodec ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.35)),1)
define KernelPackage/sound-soc-jz4740-codec
SUBMENU:=$(SOUND_MENU)
DEPENDS:=kmod-sound-soc-core @TARGET_xburst
TITLE:=JZ4740 SoC internal codec support
KCONFIG:=CONFIG_SND_SOC_JZ4740_CODEC
FILES:=$(LINUX_DIR)/sound/soc/codecs/snd-soc-jz4740-codec.ko
AUTOLOAD:=$(call AutoLoad,60,snd-soc-jz4740-codec)
endef
else
define KernelPackage/sound-soc-jz4740-codec
SUBMENU:=$(SOUND_MENU) SUBMENU:=$(SOUND_MENU)
DEPENDS:=kmod-sound-soc-core @TARGET_xburst DEPENDS:=kmod-sound-soc-core @TARGET_xburst
TITLE:=JZ4740 SoC internal codec support TITLE:=JZ4740 SoC internal codec support
@ -21,10 +31,11 @@ define KernelPackage/sound-soc-jzcodec
FILES:=$(LINUX_DIR)/sound/soc/codecs/snd-soc-jzcodec.ko FILES:=$(LINUX_DIR)/sound/soc/codecs/snd-soc-jzcodec.ko
AUTOLOAD:=$(call AutoLoad,60,snd-soc-jzcodec) AUTOLOAD:=$(call AutoLoad,60,snd-soc-jzcodec)
endef endef
endif
define KernelPackage/sound-soc-xburst/default define KernelPackage/sound-soc-xburst/default
SUBMENU:=$(SOUND_MENU) SUBMENU:=$(SOUND_MENU)
DEPENDS:=kmod-sound-soc-jz4740 kmod-sound-soc-jzcodec @TARGET_xburst_$(if $(4),$(4),$(3)) DEPENDS:=kmod-sound-soc-jz4740 kmod-sound-soc-jz4740-codec @TARGET_xburst_$(if $(4),$(4),$(3))
TITLE:=$(1) sound support TITLE:=$(1) sound support
KCONFIG:=CONFIG_SND_JZ4740_SOC_$(2) KCONFIG:=CONFIG_SND_JZ4740_SOC_$(2)
FILES:=$(LINUX_DIR)/sound/soc/jz4740/snd-soc-$(3).ko FILES:=$(LINUX_DIR)/sound/soc/jz4740/snd-soc-$(3).ko
@ -44,7 +55,7 @@ $(call KernelPackage/sound-soc-xburst/default,Hanvon N526,N526,n526)
endef endef
$(eval $(call KernelPackage,sound-soc-jz4740)) $(eval $(call KernelPackage,sound-soc-jz4740))
$(eval $(call KernelPackage,sound-soc-jzcodec)) $(eval $(call KernelPackage,sound-soc-jz4740-codec))
$(eval $(call KernelPackage,sound-soc-qilb60)) $(eval $(call KernelPackage,sound-soc-qilb60))
$(eval $(call KernelPackage,sound-soc-n516)) $(eval $(call KernelPackage,sound-soc-n516))
$(eval $(call KernelPackage,sound-soc-n526)) $(eval $(call KernelPackage,sound-soc-n526))

View file

@ -3,6 +3,6 @@ DEFAULT_PACKAGES += \
kmod-sound-core \ kmod-sound-core \
kmod-sound-soc-core \ kmod-sound-soc-core \
kmod-sound-soc-jz4740 \ kmod-sound-soc-jz4740 \
kmod-sound-soc-jzcodec \ kmod-sound-soc-jz4740-codec \
kmod-sound-soc-n516 \ kmod-sound-soc-n516 \

View file

@ -3,5 +3,5 @@ DEFAULT_PACKAGES += \
kmod-sound-core \ kmod-sound-core \
kmod-sound-soc-core \ kmod-sound-soc-core \
kmod-sound-soc-jz4740 \ kmod-sound-soc-jz4740 \
kmod-sound-soc-jzcodec \ kmod-sound-soc-jz4740-codec \
kmod-sound-soc-n516 \ kmod-sound-soc-n516 \

View file

@ -3,6 +3,6 @@ DEFAULT_PACKAGES += \
kmod-sound-core \ kmod-sound-core \
kmod-sound-soc-core \ kmod-sound-soc-core \
kmod-sound-soc-jz4740 \ kmod-sound-soc-jz4740 \
kmod-sound-soc-jzcodec \ kmod-sound-soc-jz4740-codec \
kmod-sound-soc-qilb60 \ kmod-sound-soc-qilb60 \