aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey Vlasov <vsu@altlinux.ru>2005-08-22 07:43:39 -0400
committerJaroslav Kysela <perex@suse.cz>2005-08-30 02:46:55 -0400
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 616504ef3702..b584172c1104 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)
1629 u32 subid = ((u32)ac97->subsystem_vendor << 16) | ac97->subsystem_device; 1629 u32 subid = ((u32)ac97->subsystem_vendor << 16) | ac97->subsystem_device;
1630 switch (subid) { 1630 switch (subid) {
1631 case 0x103c0890: /* HP nc6000 */ 1631 case 0x103c0890: /* HP nc6000 */
1632 case 0x103c099c: /* HP nx6110 */
1632 case 0x103c006d: /* HP nx9105 */ 1633 case 0x103c006d: /* HP nx9105 */
1633 case 0x17340088: /* FSC Scenic-W */ 1634 case 0x17340088: /* FSC Scenic-W */
1634 /* enable headphone jack sense */ 1635 /* enable headphone jack sense */
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 390b6c8f9a10..e38984dc4d95 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -1826,6 +1826,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
1826 }, 1826 },
1827 { 1827 {
1828 .subvendor = 0x103c, 1828 .subvendor = 0x103c,
1829 .subdevice = 0x099c,
1830 .name = "HP nx6110", /* AD1981B */
1831 .type = AC97_TUNE_HP_ONLY
1832 },
1833 {
1834 .subvendor = 0x103c,
1829 .subdevice = 0x129d, 1835 .subdevice = 0x129d,
1830 .name = "HP xw8000", 1836 .name = "HP xw8000",
1831 .type = AC97_TUNE_HP_ONLY 1837 .type = AC97_TUNE_HP_ONLY