On 2010-10-21 23:28, Takashi Iwai wrote: > At Thu, 21 Oct 2010 17:09:49 +0200, > Diego Elio Pettenà wrote: >> >> From: David Henningsson<david.henningsson@xxxxxxxxxxxxx> >> >> (Ported on top of 2.6.36) >> >> BugLink: http://launchpad.net/bugs/628961 >> BugLink: http://launchpad.net/bugs/605047 >> >> CC: Diego Elio PettenÃ<flameeyes@xxxxxxxxx> > > I'd need sign-offs of you and David. > Could you guys give them? Signed-off-by: David Henningsson <david.henningsson@xxxxxxxxxxxxx> Please note that 1) This will enable the internal mic, but disable the dock mic (if any) at the same time 2) sound-2.6 has a more stable solution as it allows more than one mic per position in the array, so this should not go into sound-2.6. These were the reasons I did not send it here originally, as my guess was that you wouldn't accept it. But feel free to add it into 2.6.36 if you like. > > > Takashi > >> --- >> sound/pci/hda/patch_sigmatel.c | 13 +++++++++++++ >> 1 files changed, 13 insertions(+), 0 deletions(-) >> >> diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c >> index c16c5ba..be79c3c 100644 >> --- a/sound/pci/hda/patch_sigmatel.c >> +++ b/sound/pci/hda/patch_sigmatel.c >> @@ -1633,6 +1633,13 @@ 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 hp_dv7_4000_pin_configs[10] = { >> 0x03a12050, 0x0321201f, 0x40f000f0, 0x90170110, >> 0x40f000f0, 0x40f000f0, 0x90170110, 0xd5a30140, >> @@ -1643,6 +1650,7 @@ 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, >> [STAC_HP_DV7_4000] = hp_dv7_4000_pin_configs, >> }; >> >> @@ -1651,6 +1659,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", >> [STAC_92HD83XXX_HP] = "hp", >> [STAC_HP_DV7_4000] = "hp-dv7-4000", >> }; >> @@ -1663,6 +1672,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), >> SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xff00, 0x3600, >> "HP", STAC_92HD83XXX_HP), >> {} /* terminator */ >> -- >> 1.7.3.1 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in >> the body of a message to majordomo@xxxxxxxxxxxxxxx >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> Please read the FAQ at http://www.tux.org/lkml/ >> > -- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic _______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
