| Message ID | 20201204123459.71474-1-hui.wang@canonical.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ALSA: hda/realtek: make bass spk volume adjustable on a yoga laptop | expand |
On Fri, 04 Dec 2020 13:34:59 +0100, Hui Wang wrote: > > This also make the headset button work on this machine. Hm, the description isn't clearly related with the code changes. Could you elaborate a bit more? The functions you changed are used commonly, so it needs clarification. thanks, Takashi > > Cc: <stable@vger.kernel.org> > Signed-off-by: Hui Wang <hui.wang@canonical.com> > --- > sound/pci/hda/patch_realtek.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c > index 8616c5624870..5a905fa1b33a 100644 > --- a/sound/pci/hda/patch_realtek.c > +++ b/sound/pci/hda/patch_realtek.c > @@ -3104,6 +3104,7 @@ static void alc_disable_headset_jack_key(struct hda_codec *codec) > case 0x10ec0215: > case 0x10ec0225: > case 0x10ec0285: > + case 0x10ec0287: > case 0x10ec0295: > case 0x10ec0289: > case 0x10ec0299: > @@ -3130,6 +3131,7 @@ static void alc_enable_headset_jack_key(struct hda_codec *codec) > case 0x10ec0215: > case 0x10ec0225: > case 0x10ec0285: > + case 0x10ec0287: > case 0x10ec0295: > case 0x10ec0289: > case 0x10ec0299: > @@ -8578,6 +8580,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { > {0x14, 0x90170110}, > {0x19, 0x04a11040}, > {0x21, 0x04211020}), > + SND_HDA_PIN_QUIRK(0x10ec0287, 0x17aa, "Lenovo", ALC285_FIXUP_THINKPAD_HEADSET_JACK, > + {0x14, 0x90170110}, > + {0x17, 0x90170111}, > + {0x19, 0x03a11030}, > + {0x21, 0x03211020}), > SND_HDA_PIN_QUIRK(0x10ec0286, 0x1025, "Acer", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE, > {0x12, 0x90a60130}, > {0x17, 0x90170110}, > -- > 2.25.1 >
On 12/4/20 11:50 PM, Takashi Iwai wrote: > On Fri, 04 Dec 2020 13:34:59 +0100, > Hui Wang wrote: >> This also make the headset button work on this machine. > Hm, the description isn't clearly related with the code changes. > Could you elaborate a bit more? The functions you changed are used > commonly, so it needs clarification. > > > thanks, > > Takashi OK, will change the description in the v2. Thanks, Hui. > >> Cc: <stable@vger.kernel.org> >> Signed-off-by: Hui Wang <hui.wang@canonical.com> >> --- >> sound/pci/hda/patch_realtek.c | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c >> index 8616c5624870..5a905fa1b33a 100644 >> --- a/sound/pci/hda/patch_realtek.c >> +++ b/sound/pci/hda/patch_realtek.c >> @@ -3104,6 +3104,7 @@ static void alc_disable_headset_jack_key(struct hda_codec *codec) >> case 0x10ec0215: >> case 0x10ec0225: >> case 0x10ec0285: >> + case 0x10ec0287: >> case 0x10ec0295: >> case 0x10ec0289: >> case 0x10ec0299: >> @@ -3130,6 +3131,7 @@ static void alc_enable_headset_jack_key(struct hda_codec *codec) >> case 0x10ec0215: >> case 0x10ec0225: >> case 0x10ec0285: >> + case 0x10ec0287: >> case 0x10ec0295: >> case 0x10ec0289: >> case 0x10ec0299: >> @@ -8578,6 +8580,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { >> {0x14, 0x90170110}, >> {0x19, 0x04a11040}, >> {0x21, 0x04211020}), >> + SND_HDA_PIN_QUIRK(0x10ec0287, 0x17aa, "Lenovo", ALC285_FIXUP_THINKPAD_HEADSET_JACK, >> + {0x14, 0x90170110}, >> + {0x17, 0x90170111}, >> + {0x19, 0x03a11030}, >> + {0x21, 0x03211020}), >> SND_HDA_PIN_QUIRK(0x10ec0286, 0x1025, "Acer", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE, >> {0x12, 0x90a60130}, >> {0x17, 0x90170110}, >> -- >> 2.25.1 >>
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 8616c5624870..5a905fa1b33a 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3104,6 +3104,7 @@ static void alc_disable_headset_jack_key(struct hda_codec *codec) case 0x10ec0215: case 0x10ec0225: case 0x10ec0285: + case 0x10ec0287: case 0x10ec0295: case 0x10ec0289: case 0x10ec0299: @@ -3130,6 +3131,7 @@ static void alc_enable_headset_jack_key(struct hda_codec *codec) case 0x10ec0215: case 0x10ec0225: case 0x10ec0285: + case 0x10ec0287: case 0x10ec0295: case 0x10ec0289: case 0x10ec0299: @@ -8578,6 +8580,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x14, 0x90170110}, {0x19, 0x04a11040}, {0x21, 0x04211020}), + SND_HDA_PIN_QUIRK(0x10ec0287, 0x17aa, "Lenovo", ALC285_FIXUP_THINKPAD_HEADSET_JACK, + {0x14, 0x90170110}, + {0x17, 0x90170111}, + {0x19, 0x03a11030}, + {0x21, 0x03211020}), SND_HDA_PIN_QUIRK(0x10ec0286, 0x1025, "Acer", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE, {0x12, 0x90a60130}, {0x17, 0x90170110},
This also make the headset button work on this machine. Cc: <stable@vger.kernel.org> Signed-off-by: Hui Wang <hui.wang@canonical.com> --- sound/pci/hda/patch_realtek.c | 7 +++++++ 1 file changed, 7 insertions(+)