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

Commit 679d92ed authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Add 5stack-no-fp model for STAC927x 

The recent fix for the headphone volume control on IDT/STAC codecs
resulted in the removal of invalid "Side" volume eventually.  But,
if the front panel doesn't exist, this setup could be regarded as a
sort of regression, as reported in kernel bug #13250.

Now as a workaround, a new model 5stack-no-fp is added so that the user
without the front panel can choose this one explicitly.

Reference: bko#13250
	http://bugzilla.kernel.org/show_bug.cgi?id=13250



Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 93574844

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/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",

};