summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey Vlasov <vsu@altlinux.ru>2005-08-22 13:43:39 +0200
committerJaroslav Kysela <perex@suse.cz>2005-08-30 08:46:55 +0200
commit66d10647feb32178e1204d5b5c7126b1731efe9c (patch)
treede6defee8130140f9aca2342b63a192bc9144ab5
parent5049c35b1389097a1c0c7686519928eaaf31e40b (diff)
[ALSA] HP nx6110 quirks
Intel8x0 driver,AC97 Codec The HP nx6110 laptop needs to have Headphone Jack Sense enabled so that the internal speakers will be turned off when headphones are plugged in. Also ac97_quirk=hp_only is needed to make a single Master volume in the mixer instead of separate volumes for internal speakers and headphones, which just confuses the user. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/ac97/ac97_patch.c1
-rw-r--r--sound/pci/intel8x0.c6
2 files changed, 7 insertions, 0 deletions
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index 616504ef370..b584172c110 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -1629,6 +1629,7 @@ static void check_ad1981_hp_jack_sense(ac97_t *ac97)
u32 subid = ((u32)ac97->subsystem_vendor << 16) | ac97->subsystem_device;
switch (subid) {
case 0x103c0890: /* HP nc6000 */
+ case 0x103c099c: /* HP nx6110 */
case 0x103c006d: /* HP nx9105 */
case 0x17340088: /* FSC Scenic-W */
/* enable headphone jack sense */
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 390b6c8f9a1..e38984dc4d9 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -1826,6 +1826,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
},
{
.subvendor = 0x103c,
+ .subdevice = 0x099c,
+ .name = "HP nx6110", /* AD1981B */
+ .type = AC97_TUNE_HP_ONLY
+ },
+ {
+ .subvendor = 0x103c,
.subdevice = 0x129d,
.name = "HP xw8000",
.type = AC97_TUNE_HP_ONLY