[Lucid,Maverick] UBUNTU: SAUCE: (no-up) ALSA: HDA: Enable internal mic on Dell E6410 and Dell E6510

Submitted by David Henningsson on Sept. 14, 2010, 9:21 a.m.

Details

Message ID 4C8F3E80.9090000@canonical.com
State Accepted
Delegated to: Brad Figg
Headers show

Commit Message

David Henningsson Sept. 14, 2010, 9:21 a.m.
BugLink: http://launchpad.net/bugs/605047

The attached patch will enable internal mic on Dell E6410 and Dell 
E6510. It will not go upstream since Takashi decided on a different 
solution. Takashi's solution is a bit invasive though, so it won't land 
for Lucid or Maverick, so we'll need this less invasive one instead.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
---
  sound/pci/hda/patch_sigmatel.c |   15 +++++++++++++++
  1 files changed, 15 insertions(+), 0 deletions(-)

Comments

Stefan Bader Sept. 14, 2010, 10:01 a.m.
This basically is what we have done in th Lucid-LBM package. The patch itself is
self contained and only addresses specific HW, so it fits into SRU policy.
I think the only thing needing some thought is the tagging of the commit message
title. It probably should be "UBUNTU: SAUCE: (no-up) ..."

-Stefan

On 09/14/2010 11:21 AM, David Henningsson wrote:
> BugLink: http://launchpad.net/bugs/605047
> 
> The attached patch will enable internal mic on Dell E6410 and Dell
> E6510. It will not go upstream since Takashi decided on a different
> solution. Takashi's solution is a bit invasive though, so it won't land
> for Lucid or Maverick, so we'll need this less invasive one instead.
> 
> Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  sound/pci/hda/patch_sigmatel.c |   15 +++++++++++++++
>  1 files changed, 15 insertions(+), 0 deletions(-)
> 
>
Mario Limonciello Sept. 14, 2010, 1:59 p.m.
David:

What does this actually do to the mic on the dock?  Is it entirely 
unselectable after this patch has been run?

+/* Deliberately turn off 0x0f (Dock Mic) to make it choose Int Mic instead */


On 09/14/2010 04:21 AM, David Henningsson wrote:
> BugLink: http://launchpad.net/bugs/605047
>
> The attached patch will enable internal mic on Dell E6410 and Dell
> E6510. It will not go upstream since Takashi decided on a different
> solution. Takashi's solution is a bit invasive though, so it won't land
> for Lucid or Maverick, so we'll need this less invasive one instead.
>
> Signed-off-by: David Henningsson<david.henningsson@canonical.com>
> ---
>    sound/pci/hda/patch_sigmatel.c |   15 +++++++++++++++
>    1 files changed, 15 insertions(+), 0 deletions(-)
>
>
David Henningsson Sept. 14, 2010, 2:13 p.m.
On 2010-09-14 15:59, Mario Limonciello wrote:
>   David:
>
> What does this actually do to the mic on the dock? Is it entirely
> unselectable after this patch has been run?

Yes, instead of the Internal Mic being entirely unselectable. Takashi's 
version enables all three, but is more invasive.

>
> +/* Deliberately turn off 0x0f (Dock Mic) to make it choose Int Mic instead */
>
>
> On 09/14/2010 04:21 AM, David Henningsson wrote:
>> BugLink:http://launchpad.net/bugs/605047
>>
>> The attached patch will enable internal mic on Dell E6410 and Dell
>> E6510. It will not go upstream since Takashi decided on a different
>> solution. Takashi's solution is a bit invasive though, so it won't land
>> for Lucid or Maverick, so we'll need this less invasive one instead.
>>
>> Signed-off-by: David Henningsson<david.henningsson@canonical.com>
>> ---
>>    sound/pci/hda/patch_sigmatel.c |   15 +++++++++++++++
>>    1 files changed, 15 insertions(+), 0 deletions(-)
>>
>>
>
> --
> *Mario Limonciello*
> Linux Engineer
> *Dell* | OS Engineering
Leann Ogasawara Sept. 14, 2010, 4:40 p.m.
On Tue, 2010-09-14 at 11:21 +0200, David Henningsson wrote:
> BugLink: http://launchpad.net/bugs/605047
> 
> The attached patch will enable internal mic on Dell E6410 and Dell 
> E6510. It will not go upstream since Takashi decided on a different 
> solution. Takashi's solution is a bit invasive though, so it won't land 
> for Lucid or Maverick, so we'll need this less invasive one instead.
> 
> Signed-off-by: David Henningsson <david.henningsson@canonical.com>
> ---
>   sound/pci/hda/patch_sigmatel.c |   15 +++++++++++++++
>   1 files changed, 15 insertions(+), 0 deletions(-)

Hi David,

This looks reasonable enough to apply to Maverick.  However, the patch
doesn't apply cleanly to the Maverick linux master repo.  Care to fix it
up and re-send.  Also, I assume I can add a note to the commit message
stating that we should be able to drop this patch in Natty as it'll be
obsoleted by Takashi's solution?

Thanks,
Leann
Brad Figg Sept. 16, 2010, 1:10 p.m.
On 09/14/2010 02:21 AM, David Henningsson wrote:
> BugLink: http://launchpad.net/bugs/605047
>
> The attached patch will enable internal mic on Dell E6410 and Dell E6510. It will not go upstream since Takashi decided on a different solution. Takashi's solution is a bit invasive though, so it won't land for Lucid or Maverick, so we'll need this less
> invasive one instead.
>
> Signed-off-by: David Henningsson <david.henningsson@canonical.com>
> ---
> sound/pci/hda/patch_sigmatel.c | 15 +++++++++++++++
> 1 files changed, 15 insertions(+), 0 deletions(-)
>
>

Acked-by: Brad Figg <brad.figg@canonical.com>

This is the same patch that I previously ack'd for LBM. Still looks
good :-).
Steve Conklin Sept. 17, 2010, 2:52 p.m.
On Thu, 2010-09-16 at 06:10 -0700, Brad Figg wrote:
> On 09/14/2010 02:21 AM, David Henningsson wrote:
> > BugLink: http://launchpad.net/bugs/605047
> >
> > The attached patch will enable internal mic on Dell E6410 and Dell E6510. It will not go upstream since Takashi decided on a different solution. Takashi's solution is a bit invasive though, so it won't land for Lucid or Maverick, so we'll need this less
> > invasive one instead.
> >
> > Signed-off-by: David Henningsson <david.henningsson@canonical.com>
> > ---
> > sound/pci/hda/patch_sigmatel.c | 15 +++++++++++++++
> > 1 files changed, 15 insertions(+), 0 deletions(-)
> >
> >
> 
> Acked-by: Brad Figg <brad.figg@canonical.com>
> 
> This is the same patch that I previously ack'd for LBM. Still looks
> good :-).
> 
> -- 
> Brad Figg brad.figg@canonical.com http://www.canonical.com
> 

Acked-by: Steve Conklin <sconklin@canonical.com>
Brad Figg Sept. 22, 2010, 3:26 p.m.
On 09/14/2010 02:21 AM, David Henningsson wrote:
> BugLink: http://launchpad.net/bugs/605047
>
> The attached patch will enable internal mic on Dell E6410 and Dell E6510. It will not go upstream since Takashi decided on a different solution. Takashi's solution is a bit invasive though, so it won't land for Lucid or Maverick, so we'll need this less
> invasive one instead.
>
> Signed-off-by: David Henningsson <david.henningsson@canonical.com>
> ---
> sound/pci/hda/patch_sigmatel.c | 15 +++++++++++++++
> 1 files changed, 15 insertions(+), 0 deletions(-)
>
>
Applied to Lucid linux master.

Patch hide | download patch | download mbox

From 800e5819ba6a794bf02f074b0fcb5cf8725b25c8 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Fri, 3 Sep 2010 21:01:42 +0200
Subject: [PATCH] ALSA: HDA: Enable internal mic on Dell E6410 and Dell E6510

BugLink: http://launchpad.net/bugs/628961
BugLink: http://launchpad.net/bugs/605047

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
---
 sound/pci/hda/patch_sigmatel.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index fee411b..7b9c069 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -93,6 +93,7 @@  enum {
 	STAC_92HD83XXX_REF,
 	STAC_92HD83XXX_PWR_REF,
 	STAC_DELL_S14,
+	STAC_DELL_E6410,
 	STAC_92HD83XXX_MODELS
 };
 
@@ -1617,10 +1618,19 @@  static unsigned int dell_s14_pin_configs[10] = {
 	0x40f000f0, 0x40f000f0,
 };
 
+/* Deliberately turn off 0x0f (Dock Mic) to make it choose Int Mic instead */
+static unsigned int dell_e6410_pin_configs[10] = {
+	0x04a11020, 0x0421101f, 0x400000f0, 0x90170110,
+	0x23011050, 0x40f000f0, 0x400000f0, 0x90a60130,
+	0x40f000f0, 0x40f000f0,
+};
+
+
 static unsigned int *stac92hd83xxx_brd_tbl[STAC_92HD83XXX_MODELS] = {
 	[STAC_92HD83XXX_REF] = ref92hd83xxx_pin_configs,
 	[STAC_92HD83XXX_PWR_REF] = ref92hd83xxx_pin_configs,
 	[STAC_DELL_S14] = dell_s14_pin_configs,
+	[STAC_DELL_E6410] = dell_e6410_pin_configs,
 };
 
 static const char *stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = {
@@ -1628,6 +1638,7 @@  static const char *stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = {
 	[STAC_92HD83XXX_REF] = "ref",
 	[STAC_92HD83XXX_PWR_REF] = "mic-ref",
 	[STAC_DELL_S14] = "dell-s14",
+	[STAC_DELL_E6410] = "dell-e6410",
 };
 
 static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
@@ -1638,6 +1649,10 @@  static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
 		      "DFI LanParty", STAC_92HD83XXX_REF),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02ba,
 		      "unknown Dell", STAC_DELL_S14),
+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x040a,
+		      "Dell E6410", STAC_DELL_E6410),
+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x040b,
+		      "Dell E6510", STAC_DELL_E6410),
 	{} /* terminator */
 };
 
-- 
1.7.0.4