At Fri, 28 Jan 2011 13:40:34 +0100, David Henningsson wrote:
On 2011-01-28 13:10, Takashi Iwai wrote:
At Fri, 28 Jan 2011 12:51:30 +0100, David Henningsson wrote:
On 2011-01-28 09:01, Takashi Iwai wrote:
At Thu, 27 Jan 2011 10:37:02 +0100, David Henningsson wrote:
From c8c0ca221b4de97682d2e9e5ad73c0ac6346b398 Mon Sep 17 00:00:00 2001
From: David Henningssondavid.henningsson@canonical.com Date: Thu, 27 Jan 2011 10:28:46 +0100 Subject: [PATCH] ALSA: HDA: Fix microphone(s) on Lenovo Edge 13
BugLink: http://bugs.launchpad.net/bugs/708521
This Edge 13 model has an internal mic at 0x1a and should therefore use the asus quirk.
Signed-off-by: David Henningssondavid.henningsson@canonical.com
sound/pci/hda/patch_conexant.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 9867afc..7e1ca43 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -3120,6 +3120,7 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = { SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5), SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400s", CXT5066_THINKPAD), SND_PCI_QUIRK(0x17aa, 0x21c5, "Thinkpad Edge 13", CXT5066_THINKPAD),
- SND_PCI_QUIRK(0x17aa, 0x21c6, "Thinkpad Edge 13", CXT5066_ASUS),
Can 21c5 and 21c6 be incompatible models?
Good question. Seems like Manoj committed that one, I'll ask him about it.
I followed the buglink for Manoj's commit and found an internal mic at node 0x1a, so it's likely it should be changed to the asus model.
This should be merged, I guess.
I applided the patch but currently it's for 2.6.39 since CXT5066_ASUS changes aren't queued for 2.6.38 (as non-trivial changes).
Sorry, I was under the impression that you would accept a backport for 2.6.38, as you said in the earlier email?
Ah, no. I didn't mean that. Sorry not being clear enough.
Moving the commits from 2.6.39 tree is possible but a bit mess because of rebase, thus I'd like to avoid it, unless it's urgently needed.
Well, that's up to you - from my/Ubuntu's perspective, it's important to have it in 2.6.38 (Ubuntu 11.04 will have kernel 2.6.38), so if you don't, I'll just apply it downstream instead, in the Ubuntu kernel.
OK, I merged all the pending conexant fixes back to fix/hda branch for 2.6.38 tree, as fortunately there have been only clean fixes in topic/hda branch so far. It'll be included in the next pull request to Linus.
thanks,
Takashi