From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mario Subject: Re: Enable docking station speaker jack for new Lenovo Thinkpads Date: Wed, 01 Aug 2012 22:51:04 +0200 Message-ID: <501996B8.9040609@hadiko.de> References: <50170719.8090207@hadiko.de> <335971331.CJ8quuUl7T@i82pc11> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: Received: from mailout.scc.kit.edu (mailout.scc.kit.edu [129.13.185.202]) by alsa0.perex.cz (Postfix) with ESMTP id 7F7D2265DFF for ; Wed, 1 Aug 2012 22:51:08 +0200 (CEST) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Takashi Iwai Cc: alsa-devel@alsa-project.org List-Id: alsa-devel@alsa-project.org It works with both patches and kernel 3.4.5. Thank you very much! The only issue left, is that there is "plop" sound during booting. But I guess that is problem with mixer levels/pulseaudio?! Best regards, Mario On 01.08.2012 18:26, Takashi Iwai wrote: > At Wed, 01 Aug 2012 11:37:19 +0200, > Takashi Iwai wrote: >> >> At Wed, 01 Aug 2012 10:47:05 +0200, >> Mario wrote: >>> >>> On Wednesday 01 August 2012 08:05:57 Takashi Iwai wrote: >>>> Which kernel are you using? >>> >>> I'm using 3.4.5 with gentoo patches. >>> >>>>> Pin Default 0x411111f0: [N/A] Speaker at Ext Rear >>>> >>>> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >>>> >>>> This is the reason. The driver checks the pin config set by BIOS, >>>> and it leaves this pin unused. Could you give alsa-info.sh output for >>>> more checks? >>> >>> I included the link to alsa-info in my original mail. ;) >>> >>> This is the link: >>> http://www.alsa-project.org/db/?f=e297bdda4fd099425516c7c831e28a2c7d8ae6b6 >>> I append the info below this mail. >> >> Thanks. >> >> Basically you can build your kernel based on 3.5, cherry-pick the >> commit 108cc108a3bb42fe4705df1317ff98e1e29428a6, then pass >> model=lenovo-dock option, or apply the patch below in addition. > > It seems that the commit 108cc108 can't be cherry-picked > straightforwardly. > > Below is the patch rebased for 3.5.x. It should be applicable to > 3.4.x kernel, too. Give it a try. You can apply the previous > one-liner patch after this one for enabling T530 fixup. > > > Takashi > > --- > From: David Henningsson > Subject: [PATCH] ALSA: hda - add dock support for Thinkpad X230 Tablet > > commit 108cc108a3bb42fe4705df1317ff98e1e29428a6 upstream. > > Also add a model/fixup string "lenovo-dock", so that other Thinkpad > users will be able to test this fixup easily, to see if it enables > dock I/O for them as well. > > Cc: stable@kernel.org > BugLink: https://bugs.launchpad.net/bugs/1026953 > Tested-by: John McCarron > Signed-off-by: David Henningsson > Signed-off-by: Takashi Iwai > --- > Documentation/sound/alsa/HD-Audio-Models.txt | 3 ++- > sound/pci/hda/patch_realtek.c | 27 ++++++++++++++++++++++++++ > 2 files changed, 29 insertions(+), 1 deletion(-) > > diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt > index 03f7897..286ec04 100644 > --- a/Documentation/sound/alsa/HD-Audio-Models.txt > +++ b/Documentation/sound/alsa/HD-Audio-Models.txt > @@ -21,10 +21,11 @@ ALC267/268 > ========== > N/A > > -ALC269 > +ALC269/270/275/276/280/282 > ====== > laptop-amic Laptops with analog-mic input > laptop-dmic Laptops with digital-mic input > + lenovo-dock Enables docking station I/O for some Lenovos > > ALC662/663/272 > ============== > diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c > index aa4c25e..222c1f5 100644 > --- a/sound/pci/hda/patch_realtek.c > +++ b/sound/pci/hda/patch_realtek.c > @@ -5704,6 +5704,15 @@ static int alc269_resume(struct hda_codec *codec) > } > #endif /* CONFIG_PM */ > > +static void alc269_fixup_pincfg_no_hp_to_lineout(struct hda_codec *codec, > + const struct alc_fixup *fix, int action) > +{ > + struct alc_spec *spec = codec->spec; > + > + if (action == ALC_FIXUP_ACT_PRE_PROBE) > + spec->parse_flags = HDA_PINCFG_NO_HP_FIXUP; > +} > + > static void alc269_fixup_hweq(struct hda_codec *codec, > const struct alc_fixup *fix, int action) > { > @@ -5828,6 +5837,8 @@ enum { > ALC269VB_FIXUP_AMIC, > ALC269VB_FIXUP_DMIC, > ALC269_FIXUP_MIC2_MUTE_LED, > + ALC269_FIXUP_LENOVO_DOCK, > + ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT, > }; > > static const struct alc_fixup alc269_fixups[] = { > @@ -5952,6 +5963,20 @@ static const struct alc_fixup alc269_fixups[] = { > .type = ALC_FIXUP_FUNC, > .v.func = alc269_fixup_mic2_mute, > }, > + [ALC269_FIXUP_LENOVO_DOCK] = { > + .type = ALC_FIXUP_PINS, > + .v.pins = (const struct alc_pincfg[]) { > + { 0x19, 0x23a11040 }, /* dock mic */ > + { 0x1b, 0x2121103f }, /* dock headphone */ > + { } > + }, > + .chained = true, > + .chain_id = ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT > + }, > + [ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT] = { > + .type = ALC_FIXUP_FUNC, > + .v.func = alc269_fixup_pincfg_no_hp_to_lineout, > + }, > }; > > static const struct snd_pci_quirk alc269_fixup_tbl[] = { > @@ -5975,6 +6000,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { > SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE), > SND_PCI_QUIRK(0x17aa, 0x21ca, "Thinkpad L412", ALC269_FIXUP_SKU_IGNORE), > SND_PCI_QUIRK(0x17aa, 0x21e9, "Thinkpad Edge 15", ALC269_FIXUP_SKU_IGNORE), > + SND_PCI_QUIRK(0x17aa, 0x2203, "Thinkpad X230 Tablet", ALC269_FIXUP_LENOVO_DOCK), > SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_QUANTA_MUTE), > SND_PCI_QUIRK(0x17aa, 0x3bf8, "Lenovo Ideapd", ALC269_FIXUP_PCM_44K), > SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD), > @@ -6033,6 +6059,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { > static const struct alc_model_fixup alc269_fixup_models[] = { > {.id = ALC269_FIXUP_AMIC, .name = "laptop-amic"}, > {.id = ALC269_FIXUP_DMIC, .name = "laptop-dmic"}, > + {.id = ALC269_FIXUP_LENOVO_DOCK, .name = "lenovo-dock"}, > {} > }; >