Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda - Fix probe of Toshiba laptops with ALC268 codec
ALSA: hda: add model for Intel DG45ID/DG45FC boards
ALSA: hda: enable speaker output for Compaq 6530s/6531s
+4
-2
sound/pci/hda/patch_analog.c
+4
-2
sound/pci/hda/patch_analog.c
···
3835
/* Port-F (int speaker) mixer - route only from analog mixer */
3836
{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
3837
{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
3838
-
/* Port-F pin */
3839
-
{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
3840
{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
3841
/* Port-C pin - internal mic-in */
3842
{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
3843
{0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x7002}, /* raise mic as default */
···
3835
/* Port-F (int speaker) mixer - route only from analog mixer */
3836
{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
3837
{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
3838
+
/* Port-F (int speaker) pin */
3839
+
{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
3840
{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
3841
+
/* required for compaq 6530s/6531s speaker output */
3842
+
{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
3843
/* Port-C pin - internal mic-in */
3844
{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
3845
{0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x7002}, /* raise mic as default */
+13
-2
sound/pci/hda/patch_realtek.c
+13
-2
sound/pci/hda/patch_realtek.c
···
12521
ALC268_TOSHIBA),
12522
SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST),
12523
SND_PCI_QUIRK(0x1170, 0x0040, "ZEPTO", ALC268_ZEPTO),
12524
-
SND_PCI_QUIRK_MASK(0x1179, 0xff00, 0xff00, "TOSHIBA A/Lx05",
12525
-
ALC268_TOSHIBA),
12526
SND_PCI_QUIRK(0x14c0, 0x0025, "COMPAL IFL90/JFL-92", ALC268_TOSHIBA),
12527
SND_PCI_QUIRK(0x152d, 0x0763, "Diverse (CPR2000)", ALC268_ACER),
12528
SND_PCI_QUIRK(0x152d, 0x0771, "Quanta IL1", ALC267_QUANTA_IL1),
12529
SND_PCI_QUIRK(0x1854, 0x1775, "LG R510", ALC268_DELL),
12530
{}
12531
};
12532
···
12702
board_config = snd_hda_check_board_config(codec, ALC268_MODEL_LAST,
12703
alc268_models,
12704
alc268_cfg_tbl);
12705
12706
if (board_config < 0 || board_config >= ALC268_MODEL_LAST) {
12707
printk(KERN_INFO "hda_codec: Unknown model for %s, "
···
12521
ALC268_TOSHIBA),
12522
SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST),
12523
SND_PCI_QUIRK(0x1170, 0x0040, "ZEPTO", ALC268_ZEPTO),
12524
SND_PCI_QUIRK(0x14c0, 0x0025, "COMPAL IFL90/JFL-92", ALC268_TOSHIBA),
12525
SND_PCI_QUIRK(0x152d, 0x0763, "Diverse (CPR2000)", ALC268_ACER),
12526
SND_PCI_QUIRK(0x152d, 0x0771, "Quanta IL1", ALC267_QUANTA_IL1),
12527
SND_PCI_QUIRK(0x1854, 0x1775, "LG R510", ALC268_DELL),
12528
+
{}
12529
+
};
12530
+
12531
+
/* Toshiba laptops have no unique PCI SSID but only codec SSID */
12532
+
static struct snd_pci_quirk alc268_ssid_cfg_tbl[] = {
12533
+
SND_PCI_QUIRK(0x1179, 0xff0a, "TOSHIBA X-200", ALC268_AUTO),
12534
+
SND_PCI_QUIRK(0x1179, 0xff0e, "TOSHIBA X-200 HDMI", ALC268_AUTO),
12535
+
SND_PCI_QUIRK_MASK(0x1179, 0xff00, 0xff00, "TOSHIBA A/Lx05",
12536
+
ALC268_TOSHIBA),
12537
{}
12538
};
12539
···
12695
board_config = snd_hda_check_board_config(codec, ALC268_MODEL_LAST,
12696
alc268_models,
12697
alc268_cfg_tbl);
12698
+
12699
+
if (board_config < 0 || board_config >= ALC268_MODEL_LAST)
12700
+
board_config = snd_hda_check_board_codec_sid_config(codec,
12701
+
ALC882_MODEL_LAST, alc268_models, alc268_ssid_cfg_tbl);
12702
12703
if (board_config < 0 || board_config >= ALC268_MODEL_LAST) {
12704
printk(KERN_INFO "hda_codec: Unknown model for %s, "
+6
sound/pci/hda/patch_sigmatel.c
+6
sound/pci/hda/patch_sigmatel.c
···
76
STAC_92HD73XX_AUTO,
77
STAC_92HD73XX_NO_JD, /* no jack-detection */
78
STAC_92HD73XX_REF,
79
STAC_DELL_M6_AMIC,
80
STAC_DELL_M6_DMIC,
81
STAC_DELL_M6_BOTH,
···
1778
[STAC_92HD73XX_AUTO] = "auto",
1779
[STAC_92HD73XX_NO_JD] = "no-jd",
1780
[STAC_92HD73XX_REF] = "ref",
1781
[STAC_DELL_M6_AMIC] = "dell-m6-amic",
1782
[STAC_DELL_M6_DMIC] = "dell-m6-dmic",
1783
[STAC_DELL_M6_BOTH] = "dell-m6",
···
1791
"DFI LanParty", STAC_92HD73XX_REF),
1792
SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,
1793
"DFI LanParty", STAC_92HD73XX_REF),
1794
SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0254,
1795
"Dell Studio 1535", STAC_DELL_M6_DMIC),
1796
SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0255,
···
76
STAC_92HD73XX_AUTO,
77
STAC_92HD73XX_NO_JD, /* no jack-detection */
78
STAC_92HD73XX_REF,
79
+
STAC_92HD73XX_INTEL,
80
STAC_DELL_M6_AMIC,
81
STAC_DELL_M6_DMIC,
82
STAC_DELL_M6_BOTH,
···
1777
[STAC_92HD73XX_AUTO] = "auto",
1778
[STAC_92HD73XX_NO_JD] = "no-jd",
1779
[STAC_92HD73XX_REF] = "ref",
1780
+
[STAC_92HD73XX_INTEL] = "intel",
1781
[STAC_DELL_M6_AMIC] = "dell-m6-amic",
1782
[STAC_DELL_M6_DMIC] = "dell-m6-dmic",
1783
[STAC_DELL_M6_BOTH] = "dell-m6",
···
1789
"DFI LanParty", STAC_92HD73XX_REF),
1790
SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,
1791
"DFI LanParty", STAC_92HD73XX_REF),
1792
+
SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5002,
1793
+
"Intel DG45ID", STAC_92HD73XX_INTEL),
1794
+
SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5003,
1795
+
"Intel DG45FC", STAC_92HD73XX_INTEL),
1796
SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0254,
1797
"Dell Studio 1535", STAC_DELL_M6_DMIC),
1798
SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0255,