aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorzhejiang <zhe.jiang@intel.com>2007-08-31 06:36:05 -0400
committerJaroslav Kysela <perex@perex.cz>2007-10-16 09:59:38 -0400
commitaccbe4988c5cf3dc86f0a042396163ed279536a6 (patch)
tree9dfc113ee04895c23cd4695c3d752ee50b91eb2e /sound/pci
parenta3a68c85bfb7acc874ce6d334964b95943d4ed43 (diff)
[ALSA] hda-codec - Fix capture on ALC262 HP machines
Fix the index for Front Mic capture source on ALC262 HP machines. Also, added the new capture source list for HP BPC DC7000 series to work properly. From: zhejiang <zhe.jiang@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_realtek.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index b3062afc481c..3557865dde38 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -7746,13 +7746,23 @@ static struct hda_input_mux alc262_HP_capture_source = {
7746 .num_items = 5, 7746 .num_items = 5,
7747 .items = { 7747 .items = {
7748 { "Mic", 0x0 }, 7748 { "Mic", 0x0 },
7749 { "Front Mic", 0x3 }, 7749 { "Front Mic", 0x1 },
7750 { "Line", 0x2 }, 7750 { "Line", 0x2 },
7751 { "CD", 0x4 }, 7751 { "CD", 0x4 },
7752 { "AUX IN", 0x6 }, 7752 { "AUX IN", 0x6 },
7753 }, 7753 },
7754}; 7754};
7755 7755
7756static struct hda_input_mux alc262_HP_D7000_capture_source = {
7757 .num_items = 4,
7758 .items = {
7759 { "Mic", 0x0 },
7760 { "Front Mic", 0x2 },
7761 { "Line", 0x1 },
7762 { "CD", 0x4 },
7763 },
7764};
7765
7756/* mute/unmute internal speaker according to the hp jack and mute state */ 7766/* mute/unmute internal speaker according to the hp jack and mute state */
7757static void alc262_fujitsu_automute(struct hda_codec *codec, int force) 7767static void alc262_fujitsu_automute(struct hda_codec *codec, int force)
7758{ 7768{
@@ -8357,7 +8367,7 @@ static struct alc_config_preset alc262_presets[] = {
8357 .hp_nid = 0x03, 8367 .hp_nid = 0x03,
8358 .num_channel_mode = ARRAY_SIZE(alc262_modes), 8368 .num_channel_mode = ARRAY_SIZE(alc262_modes),
8359 .channel_mode = alc262_modes, 8369 .channel_mode = alc262_modes,
8360 .input_mux = &alc262_HP_capture_source, 8370 .input_mux = &alc262_HP_D7000_capture_source,
8361 }, 8371 },
8362 [ALC262_HP_BPC_D7000_WL] = { 8372 [ALC262_HP_BPC_D7000_WL] = {
8363 .mixers = { alc262_HP_BPC_WildWest_mixer, 8373 .mixers = { alc262_HP_BPC_WildWest_mixer,
@@ -8368,7 +8378,7 @@ static struct alc_config_preset alc262_presets[] = {
8368 .hp_nid = 0x03, 8378 .hp_nid = 0x03,
8369 .num_channel_mode = ARRAY_SIZE(alc262_modes), 8379 .num_channel_mode = ARRAY_SIZE(alc262_modes),
8370 .channel_mode = alc262_modes, 8380 .channel_mode = alc262_modes,
8371 .input_mux = &alc262_HP_capture_source, 8381 .input_mux = &alc262_HP_D7000_capture_source,
8372 }, 8382 },
8373 [ALC262_BENQ_ED8] = { 8383 [ALC262_BENQ_ED8] = {
8374 .mixers = { alc262_base_mixer }, 8384 .mixers = { alc262_base_mixer },