diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-08-19 14:10:24 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-08-19 14:10:24 -0400 |
commit | 454e134d0e9e38421830f26426c66f37a6d39465 (patch) | |
tree | 9667959ec7df8a4d1ae06b6813c1a3ccaf0f271c /sound/pci | |
parent | 1c11ce8118c2055501aa03644a660c7b1e5120c7 (diff) | |
parent | 3abf2f3639959e4f53f209f93cd4d93fe9356de1 (diff) |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index efb92c83c7a6..084e291e12de 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -12407,8 +12407,6 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = { | |||
12407 | ALC268_TOSHIBA), | 12407 | ALC268_TOSHIBA), |
12408 | SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST), | 12408 | SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST), |
12409 | SND_PCI_QUIRK(0x1170, 0x0040, "ZEPTO", ALC268_ZEPTO), | 12409 | SND_PCI_QUIRK(0x1170, 0x0040, "ZEPTO", ALC268_ZEPTO), |
12410 | SND_PCI_QUIRK_MASK(0x1179, 0xff00, 0xff00, "TOSHIBA A/Lx05", | ||
12411 | ALC268_TOSHIBA), | ||
12412 | SND_PCI_QUIRK(0x14c0, 0x0025, "COMPAL IFL90/JFL-92", ALC268_TOSHIBA), | 12410 | SND_PCI_QUIRK(0x14c0, 0x0025, "COMPAL IFL90/JFL-92", ALC268_TOSHIBA), |
12413 | SND_PCI_QUIRK(0x152d, 0x0763, "Diverse (CPR2000)", ALC268_ACER), | 12411 | SND_PCI_QUIRK(0x152d, 0x0763, "Diverse (CPR2000)", ALC268_ACER), |
12414 | SND_PCI_QUIRK(0x152d, 0x0771, "Quanta IL1", ALC267_QUANTA_IL1), | 12412 | SND_PCI_QUIRK(0x152d, 0x0771, "Quanta IL1", ALC267_QUANTA_IL1), |
@@ -12416,6 +12414,15 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = { | |||
12416 | {} | 12414 | {} |
12417 | }; | 12415 | }; |
12418 | 12416 | ||
12417 | /* Toshiba laptops have no unique PCI SSID but only codec SSID */ | ||
12418 | static struct snd_pci_quirk alc268_ssid_cfg_tbl[] = { | ||
12419 | SND_PCI_QUIRK(0x1179, 0xff0a, "TOSHIBA X-200", ALC268_AUTO), | ||
12420 | SND_PCI_QUIRK(0x1179, 0xff0e, "TOSHIBA X-200 HDMI", ALC268_AUTO), | ||
12421 | SND_PCI_QUIRK_MASK(0x1179, 0xff00, 0xff00, "TOSHIBA A/Lx05", | ||
12422 | ALC268_TOSHIBA), | ||
12423 | {} | ||
12424 | }; | ||
12425 | |||
12419 | static struct alc_config_preset alc268_presets[] = { | 12426 | static struct alc_config_preset alc268_presets[] = { |
12420 | [ALC267_QUANTA_IL1] = { | 12427 | [ALC267_QUANTA_IL1] = { |
12421 | .mixers = { alc267_quanta_il1_mixer, alc268_beep_mixer, | 12428 | .mixers = { alc267_quanta_il1_mixer, alc268_beep_mixer, |
@@ -12588,6 +12595,10 @@ static int patch_alc268(struct hda_codec *codec) | |||
12588 | alc268_models, | 12595 | alc268_models, |
12589 | alc268_cfg_tbl); | 12596 | alc268_cfg_tbl); |
12590 | 12597 | ||
12598 | if (board_config < 0 || board_config >= ALC268_MODEL_LAST) | ||
12599 | board_config = snd_hda_check_board_codec_sid_config(codec, | ||
12600 | ALC882_MODEL_LAST, alc268_models, alc268_ssid_cfg_tbl); | ||
12601 | |||
12591 | if (board_config < 0 || board_config >= ALC268_MODEL_LAST) { | 12602 | if (board_config < 0 || board_config >= ALC268_MODEL_LAST) { |
12592 | printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n", | 12603 | printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n", |
12593 | codec->chip_name); | 12604 | codec->chip_name); |