ALSA: hda - Add missing hp_pins definitions for ALC269 quirks
In 2.6.33 ACL269 unsol event handler was changed to look up the pre-defined pins, but the headphone pins aren't defined properly in each quirk. This patch adds the missing definitions, and fixes the speaker auto-mute regression on some ASUS (and possibly other) laptops. Signed-off-by: Takashi Iwai <tiwai@suse.de> Cc: <stable@kernel.org>
This commit is contained in:
parent
61c2d2b5e7
commit
20645d70bd
|
@ -13561,6 +13561,8 @@ static void alc269_lifebook_unsol_event(struct hda_codec *codec,
|
||||||
static void alc269_quanta_fl1_setup(struct hda_codec *codec)
|
static void alc269_quanta_fl1_setup(struct hda_codec *codec)
|
||||||
{
|
{
|
||||||
struct alc_spec *spec = codec->spec;
|
struct alc_spec *spec = codec->spec;
|
||||||
|
spec->autocfg.hp_pins[0] = 0x15;
|
||||||
|
spec->autocfg.speaker_pins[0] = 0x14;
|
||||||
spec->ext_mic.pin = 0x18;
|
spec->ext_mic.pin = 0x18;
|
||||||
spec->ext_mic.mux_idx = 0;
|
spec->ext_mic.mux_idx = 0;
|
||||||
spec->int_mic.pin = 0x19;
|
spec->int_mic.pin = 0x19;
|
||||||
|
@ -13656,6 +13658,8 @@ static void alc269_laptop_unsol_event(struct hda_codec *codec,
|
||||||
static void alc269_laptop_dmic_setup(struct hda_codec *codec)
|
static void alc269_laptop_dmic_setup(struct hda_codec *codec)
|
||||||
{
|
{
|
||||||
struct alc_spec *spec = codec->spec;
|
struct alc_spec *spec = codec->spec;
|
||||||
|
spec->autocfg.hp_pins[0] = 0x15;
|
||||||
|
spec->autocfg.speaker_pins[0] = 0x14;
|
||||||
spec->ext_mic.pin = 0x18;
|
spec->ext_mic.pin = 0x18;
|
||||||
spec->ext_mic.mux_idx = 0;
|
spec->ext_mic.mux_idx = 0;
|
||||||
spec->int_mic.pin = 0x12;
|
spec->int_mic.pin = 0x12;
|
||||||
|
@ -13666,6 +13670,8 @@ static void alc269_laptop_dmic_setup(struct hda_codec *codec)
|
||||||
static void alc269vb_laptop_dmic_setup(struct hda_codec *codec)
|
static void alc269vb_laptop_dmic_setup(struct hda_codec *codec)
|
||||||
{
|
{
|
||||||
struct alc_spec *spec = codec->spec;
|
struct alc_spec *spec = codec->spec;
|
||||||
|
spec->autocfg.hp_pins[0] = 0x15;
|
||||||
|
spec->autocfg.speaker_pins[0] = 0x14;
|
||||||
spec->ext_mic.pin = 0x18;
|
spec->ext_mic.pin = 0x18;
|
||||||
spec->ext_mic.mux_idx = 0;
|
spec->ext_mic.mux_idx = 0;
|
||||||
spec->int_mic.pin = 0x12;
|
spec->int_mic.pin = 0x12;
|
||||||
|
@ -13676,6 +13682,8 @@ static void alc269vb_laptop_dmic_setup(struct hda_codec *codec)
|
||||||
static void alc269_laptop_amic_setup(struct hda_codec *codec)
|
static void alc269_laptop_amic_setup(struct hda_codec *codec)
|
||||||
{
|
{
|
||||||
struct alc_spec *spec = codec->spec;
|
struct alc_spec *spec = codec->spec;
|
||||||
|
spec->autocfg.hp_pins[0] = 0x15;
|
||||||
|
spec->autocfg.speaker_pins[0] = 0x14;
|
||||||
spec->ext_mic.pin = 0x18;
|
spec->ext_mic.pin = 0x18;
|
||||||
spec->ext_mic.mux_idx = 0;
|
spec->ext_mic.mux_idx = 0;
|
||||||
spec->int_mic.pin = 0x19;
|
spec->int_mic.pin = 0x19;
|
||||||
|
|
Loading…
Reference in New Issue