Merge branch 'fix/hda' into topic/hda
This commit is contained in:
commit
20e91c5750
|
@ -342,6 +342,7 @@ STAC9227/9228/9229/927x
|
|||
ref-no-jd Reference board without HP/Mic jack detection
|
||||
3stack D965 3stack
|
||||
5stack D965 5stack + SPDIF
|
||||
5stack-no-fp D965 5stack without front panel
|
||||
dell-3stack Dell Dimension E520
|
||||
dell-bios Fixes with Dell BIOS setup
|
||||
auto BIOS setup (default)
|
||||
|
|
|
@ -2147,6 +2147,7 @@ static struct snd_pci_quirk probe_mask_list[] __devinitdata = {
|
|||
/* including bogus ALC268 in slot#2 that conflicts with ALC888 */
|
||||
SND_PCI_QUIRK(0x17c0, 0x4085, "Medion MD96630", 0x01),
|
||||
/* forced codec slots */
|
||||
SND_PCI_QUIRK(0x1043, 0x1262, "ASUS W5Fm", 0x103),
|
||||
SND_PCI_QUIRK(0x1046, 0x1262, "ASUS W5F", 0x103),
|
||||
{}
|
||||
};
|
||||
|
|
|
@ -789,6 +789,12 @@ static void alc_set_input_pin(struct hda_codec *codec, hda_nid_t nid,
|
|||
pincap = (pincap & AC_PINCAP_VREF) >> AC_PINCAP_VREF_SHIFT;
|
||||
if (pincap & AC_PINCAP_VREF_80)
|
||||
val = PIN_VREF80;
|
||||
else if (pincap & AC_PINCAP_VREF_50)
|
||||
val = PIN_VREF50;
|
||||
else if (pincap & AC_PINCAP_VREF_100)
|
||||
val = PIN_VREF100;
|
||||
else if (pincap & AC_PINCAP_VREF_GRD)
|
||||
val = PIN_VREFGRD;
|
||||
}
|
||||
snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, val);
|
||||
}
|
||||
|
@ -12041,6 +12047,7 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = {
|
|||
SND_PCI_QUIRK(0x1028, 0x0253, "Dell OEM", ALC268_DELL),
|
||||
SND_PCI_QUIRK(0x1028, 0x02b0, "Dell Inspiron Mini9", ALC268_DELL),
|
||||
SND_PCI_QUIRK(0x103c, 0x30cc, "TOSHIBA", ALC268_TOSHIBA),
|
||||
SND_PCI_QUIRK(0x103c, 0x30f1, "HP TX25xx series", ALC268_TOSHIBA),
|
||||
SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST),
|
||||
SND_PCI_QUIRK(0x1179, 0xff10, "TOSHIBA A205", ALC268_TOSHIBA),
|
||||
SND_PCI_QUIRK(0x1179, 0xff50, "TOSHIBA A305", ALC268_TOSHIBA),
|
||||
|
|
|
@ -151,6 +151,7 @@ enum {
|
|||
STAC_D965_REF,
|
||||
STAC_D965_3ST,
|
||||
STAC_D965_5ST,
|
||||
STAC_D965_5ST_NO_FP,
|
||||
STAC_DELL_3ST,
|
||||
STAC_DELL_BIOS,
|
||||
STAC_927X_MODELS
|
||||
|
@ -2261,6 +2262,13 @@ static unsigned int d965_5st_pin_configs[14] = {
|
|||
0x40000100, 0x40000100
|
||||
};
|
||||
|
||||
static unsigned int d965_5st_no_fp_pin_configs[14] = {
|
||||
0x40000100, 0x40000100, 0x0181304e, 0x01014010,
|
||||
0x01a19040, 0x01011012, 0x01016011, 0x40000100,
|
||||
0x40000100, 0x40000100, 0x40000100, 0x01442070,
|
||||
0x40000100, 0x40000100
|
||||
};
|
||||
|
||||
static unsigned int dell_3st_pin_configs[14] = {
|
||||
0x02211230, 0x02a11220, 0x01a19040, 0x01114210,
|
||||
0x01111212, 0x01116211, 0x01813050, 0x01112214,
|
||||
|
@ -2273,6 +2281,7 @@ static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = {
|
|||
[STAC_D965_REF] = ref927x_pin_configs,
|
||||
[STAC_D965_3ST] = d965_3st_pin_configs,
|
||||
[STAC_D965_5ST] = d965_5st_pin_configs,
|
||||
[STAC_D965_5ST_NO_FP] = d965_5st_no_fp_pin_configs,
|
||||
[STAC_DELL_3ST] = dell_3st_pin_configs,
|
||||
[STAC_DELL_BIOS] = NULL,
|
||||
};
|
||||
|
@ -2283,6 +2292,7 @@ static const char *stac927x_models[STAC_927X_MODELS] = {
|
|||
[STAC_D965_REF] = "ref",
|
||||
[STAC_D965_3ST] = "3stack",
|
||||
[STAC_D965_5ST] = "5stack",
|
||||
[STAC_D965_5ST_NO_FP] = "5stack-no-fp",
|
||||
[STAC_DELL_3ST] = "dell-3stack",
|
||||
[STAC_DELL_BIOS] = "dell-bios",
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue