diff options
author | Tobin Davis <tdavis@dsl-only.net> | 2008-03-07 05:57:51 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 06:00:22 -0400 |
commit | b419f346994d4ba082244fb1327754bc839a4d8a (patch) | |
tree | 671b0b8f1cb898ae2e2e8fbaca150f13b3b66a6c | |
parent | 21ac1f9934d33ea2ffa71d13fa2f6286127d3caf (diff) |
[ALSA] HDA Codecs: add support for Toshiba Equium L30
This patch adds support for the Toshiba Equium L30 laptop and renames the mixer
controls to match Laptop usages.
Signed-off-by: Tobin Davis <tdavis@dsl-only.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 7937d97219d4..3c15bdf4d2cd 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -12054,11 +12054,10 @@ static struct hda_input_mux alc861vd_capture_source = { | |||
12054 | }; | 12054 | }; |
12055 | 12055 | ||
12056 | static struct hda_input_mux alc861vd_dallas_capture_source = { | 12056 | static struct hda_input_mux alc861vd_dallas_capture_source = { |
12057 | .num_items = 3, | 12057 | .num_items = 2, |
12058 | .items = { | 12058 | .items = { |
12059 | { "Front Mic", 0x0 }, | 12059 | { "Ext Mic", 0x0 }, |
12060 | { "ATAPI Mic", 0x1 }, | 12060 | { "Int Mic", 0x1 }, |
12061 | { "Line In", 0x5 }, | ||
12062 | }, | 12061 | }, |
12063 | }; | 12062 | }; |
12064 | 12063 | ||
@@ -12228,20 +12227,22 @@ static struct snd_kcontrol_new alc861vd_lenovo_mixer[] = { | |||
12228 | { } /* end */ | 12227 | { } /* end */ |
12229 | }; | 12228 | }; |
12230 | 12229 | ||
12231 | /* Pin assignment: Front=0x14, HP = 0x15, | 12230 | /* Pin assignment: Speaker=0x14, HP = 0x15, |
12232 | * Front Mic=0x18, ATAPI Mic = 0x19, Line In = 0x1d | 12231 | * Ext Mic=0x18, Int Mic = 0x19, CD = 0x1c, PC Beep = 0x1d |
12233 | */ | 12232 | */ |
12234 | static struct snd_kcontrol_new alc861vd_dallas_mixer[] = { | 12233 | static struct snd_kcontrol_new alc861vd_dallas_mixer[] = { |
12235 | HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT), | 12234 | HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT), |
12236 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), | 12235 | HDA_BIND_MUTE("Speaker Playback Switch", 0x0c, 2, HDA_INPUT), |
12237 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT), | 12236 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT), |
12238 | HDA_BIND_MUTE("Headphone Playback Switch", 0x0d, 2, HDA_INPUT), | 12237 | HDA_BIND_MUTE("Headphone Playback Switch", 0x0d, 2, HDA_INPUT), |
12239 | HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | 12238 | HDA_CODEC_VOLUME("Ext Mic Boost", 0x18, 0, HDA_INPUT), |
12240 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | 12239 | HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), |
12241 | HDA_CODEC_VOLUME("ATAPI Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | 12240 | HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
12242 | HDA_CODEC_MUTE("ATAPI Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 12241 | HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT), |
12243 | HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x05, HDA_INPUT), | 12242 | HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), |
12244 | HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x05, HDA_INPUT), | 12243 | HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
12244 | HDA_CODEC_VOLUME("PC Beep Volume", 0x0b, 0x05, HDA_INPUT), | ||
12245 | HDA_CODEC_MUTE("PC Beep Switch", 0x0b, 0x05, HDA_INPUT), | ||
12245 | { } /* end */ | 12246 | { } /* end */ |
12246 | }; | 12247 | }; |
12247 | 12248 | ||
@@ -12542,6 +12543,7 @@ static struct snd_pci_quirk alc861vd_cfg_tbl[] = { | |||
12542 | /*SND_PCI_QUIRK(0x1179, 0xff00, "DALLAS", ALC861VD_DALLAS),*/ /*lenovo*/ | 12543 | /*SND_PCI_QUIRK(0x1179, 0xff00, "DALLAS", ALC861VD_DALLAS),*/ /*lenovo*/ |
12543 | SND_PCI_QUIRK(0x1179, 0xff01, "DALLAS", ALC861VD_DALLAS), | 12544 | SND_PCI_QUIRK(0x1179, 0xff01, "DALLAS", ALC861VD_DALLAS), |
12544 | SND_PCI_QUIRK(0x1179, 0xff03, "Toshiba P205", ALC861VD_LENOVO), | 12545 | SND_PCI_QUIRK(0x1179, 0xff03, "Toshiba P205", ALC861VD_LENOVO), |
12546 | SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba L30-149", ALC861VD_DALLAS), | ||
12545 | SND_PCI_QUIRK(0x1565, 0x820d, "Biostar NF61S SE", ALC861VD_6ST_DIG), | 12547 | SND_PCI_QUIRK(0x1565, 0x820d, "Biostar NF61S SE", ALC861VD_6ST_DIG), |
12546 | SND_PCI_QUIRK(0x17aa, 0x2066, "Lenovo", ALC861VD_LENOVO), | 12548 | SND_PCI_QUIRK(0x17aa, 0x2066, "Lenovo", ALC861VD_LENOVO), |
12547 | SND_PCI_QUIRK(0x17aa, 0x3802, "Lenovo 3000 C200", ALC861VD_LENOVO), | 12549 | SND_PCI_QUIRK(0x17aa, 0x3802, "Lenovo 3000 C200", ALC861VD_LENOVO), |