openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'topic/hda-cirrus' into topic/hda

This commit is contained in:
Takashi Iwai 2009-07-30 18:09:04 +02:00
parent d195658bd7 3a38516750
commit 03cb2dafcb
5 changed files with 1216 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/sound/alsa/HD-Audio-Models.txt
View File

@ -383,3 +383,7 @@ STAC9872
======== ========
vaio VAIO laptop without SPDIF vaio VAIO laptop without SPDIF
auto BIOS setup (default) auto BIOS setup (default)
Cirrus Logic CS4206/4207
========================
mbp55 MacBook Pro 5,5

13
sound/pci/hda/Kconfig
View File

@ -148,6 +148,19 @@ config SND_HDA_ELD
def_bool y def_bool y
depends on SND_HDA_CODEC_INTELHDMI depends on SND_HDA_CODEC_INTELHDMI
config SND_HDA_CODEC_CIRRUS
bool "Build Cirrus Logic codec support"
depends on SND_HDA_INTEL
default y
help
Say Y here to include Cirrus Logic codec support in
snd-hda-intel driver, such as CS4206.
When the HD-audio driver is built as a module, the codec
support code is also built as another module,
snd-hda-codec-cirrus.
This module is automatically loaded at probing.
config SND_HDA_CODEC_CONEXANT config SND_HDA_CODEC_CONEXANT
bool "Build Conexant HD-audio codec support" bool "Build Conexant HD-audio codec support"
default y default y

4
sound/pci/hda/Makefile
View File

@ -13,6 +13,7 @@ snd-hda-codec-analog-objs := patch_analog.o
snd-hda-codec-idt-objs := patch_sigmatel.o snd-hda-codec-idt-objs := patch_sigmatel.o
snd-hda-codec-si3054-objs := patch_si3054.o snd-hda-codec-si3054-objs := patch_si3054.o
snd-hda-codec-atihdmi-objs := patch_atihdmi.o snd-hda-codec-atihdmi-objs := patch_atihdmi.o
snd-hda-codec-cirrus-objs := patch_cirrus.o
snd-hda-codec-ca0110-objs := patch_ca0110.o snd-hda-codec-ca0110-objs := patch_ca0110.o
snd-hda-codec-conexant-objs := patch_conexant.o snd-hda-codec-conexant-objs := patch_conexant.o
snd-hda-codec-via-objs := patch_via.o snd-hda-codec-via-objs := patch_via.o
@ -41,6 +42,9 @@ endif
ifdef CONFIG_SND_HDA_CODEC_ATIHDMI ifdef CONFIG_SND_HDA_CODEC_ATIHDMI
obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-atihdmi.o obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-atihdmi.o
endif endif
ifdef CONFIG_SND_HDA_CODEC_CIRRUS
obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-cirrus.o
endif
ifdef CONFIG_SND_HDA_CODEC_CA0110 ifdef CONFIG_SND_HDA_CODEC_CA0110
obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-ca0110.o obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-ca0110.o
endif endif

1
sound/pci/hda/hda_codec.c
View File

@ -44,6 +44,7 @@ struct hda_vendor_id {
/* codec vendor labels */ /* codec vendor labels */
static struct hda_vendor_id hda_vendor_ids[] = { static struct hda_vendor_id hda_vendor_ids[] = {
{ 0x1002, "ATI" }, { 0x1002, "ATI" },
{ 0x1013, "Cirrus Logic" },
{ 0x1057, "Motorola" }, { 0x1057, "Motorola" },
{ 0x1095, "Silicon Image" }, { 0x1095, "Silicon Image" },
{ 0x10de, "Nvidia" }, { 0x10de, "Nvidia" },

1194
sound/pci/hda/patch_cirrus.c Normal file
View File

File diff suppressed because it is too large Load Diff