Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 878a4f52 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Add missing check of pin vref 50 and others in Realtek codecs
  ALSA: hda - Add 5stack-no-fp model for STAC927x
  ALSA: hda - Add forced codec-slots for ASUS W5Fm
parents 733be82e 461c6c3a

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0
Original line number Diff line number Diff line
@@ -334,6 +334,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)

sound/pci/hda/hda_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -2141,6 +2141,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),

	{}

};

sound/pci/hda/patch_realtek.c

+6 −0
Original line number Diff line number Diff line
@@ -776,6 +776,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);

}

sound/pci/hda/patch_sigmatel.c

+10 −0
Original line number Diff line number Diff line
@@ -150,6 +150,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
@@ -2154,6 +2155,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,
@@ -2166,6 +2174,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,

};
@@ -2176,6 +2185,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",

};