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

Commit eefb8be4 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Remove analog mic pin override from STAC9228 dell-bios quirk 



The current fixup for dell-bios model with STAC9228 codec contains the
override of pin 0x0c for analog mic.  But this is actually just adding
a bogus pin and confuses the parser.  Better to remove it for the
auto-mic switching.

Meanwhile, for a possible regression, keep the old configuration as
model=dell-bios-amic, so that people can test it again quickly.

Tested on Dell 1420n laptop.

Reported-and-tested-by: default avatarEric Shattow <lucent@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7d4f606c

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

+1 −0
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ STAC9227/9228/9229/927x 
  5stack-no-fp	D965 5stack without front panel

  dell-3stack	Dell Dimension E520

  dell-bios	Fixes with Dell BIOS setup

  dell-bios-amic Fixes with Dell BIOS setup including analog mic

  volknob	Fixes with volume-knob widget 0x24

  auto		BIOS setup (default)

sound/pci/hda/patch_sigmatel.c

+12 −2
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ enum { 
	STAC_D965_VERBS,

	STAC_DELL_3ST,

	STAC_DELL_BIOS,

	STAC_DELL_BIOS_AMIC,

	STAC_DELL_BIOS_SPDIF,

	STAC_927X_DELL_DMIC,

	STAC_927X_VOLKNOB,
@@ -3228,8 +3229,6 @@ static const struct hda_fixup stac927x_fixups[] = { 
	[STAC_DELL_BIOS] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {

			/* configure the analog microphone on some laptops */

			{ 0x0c, 0x90a79130 },

			/* correct the front output jack as a hp out */

			{ 0x0f, 0x0227011f },

			/* correct the front input jack as a mic */
@@ -3239,6 +3238,16 @@ static const struct hda_fixup stac927x_fixups[] = { 
		.chained = true,

		.chain_id = STAC_927X_DELL_DMIC,

	},

	[STAC_DELL_BIOS_AMIC] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {

			/* configure the analog microphone on some laptops */

			{ 0x0c, 0x90a79130 },

			{}

		},

		.chained = true,

		.chain_id = STAC_DELL_BIOS,

	},

	[STAC_DELL_BIOS_SPDIF] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {
@@ -3267,6 +3276,7 @@ static const struct hda_model_fixup stac927x_models[] = { 
	{ .id = STAC_D965_5ST_NO_FP, .name = "5stack-no-fp" },

	{ .id = STAC_DELL_3ST, .name = "dell-3stack" },

	{ .id = STAC_DELL_BIOS, .name = "dell-bios" },

	{ .id = STAC_DELL_BIOS_AMIC, .name = "dell-bios-amic" },

	{ .id = STAC_927X_VOLKNOB, .name = "volknob" },

	{}

};