diff options
author | David Henningsson <david.henningsson@canonical.com> | 2010-12-20 08:24:29 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-12-20 08:59:16 -0500 |
commit | 28c4edb71d21623f1e47422194d865d2b6712fd4 (patch) | |
tree | 0bd7fe1ec8f9c243a4729fd904e823a23d5aab5a /sound/pci/hda/patch_realtek.c | |
parent | 67c6dc4df1ecdc434260898d5a4163e78c36b240 (diff) |
ALSA: HDA: Rename "Int Mic" to "Internal Mic"
"Int Mic" and "Internal Mic" both mean the same thing, so rename
the former to the latter in order to clean up the namespace a little.
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 5baaf12111ba..e976a4ddb0c3 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -2169,7 +2169,7 @@ static struct hda_input_mux alc888_acer_aspire_6530_sources[2] = { | |||
2169 | { "Line In", 0x2 }, | 2169 | { "Line In", 0x2 }, |
2170 | { "CD", 0x4 }, | 2170 | { "CD", 0x4 }, |
2171 | { "Input Mix", 0xa }, | 2171 | { "Input Mix", 0xa }, |
2172 | { "Int Mic", 0xb }, | 2172 | { "Internal Mic", 0xb }, |
2173 | }, | 2173 | }, |
2174 | }, | 2174 | }, |
2175 | { | 2175 | { |
@@ -2843,8 +2843,8 @@ static struct snd_kcontrol_new alc880_fujitsu_mixer[] = { | |||
2843 | HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), | 2843 | HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), |
2844 | HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | 2844 | HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), |
2845 | HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | 2845 | HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
2846 | HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | 2846 | HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), |
2847 | HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 2847 | HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
2848 | { } /* end */ | 2848 | { } /* end */ |
2849 | }; | 2849 | }; |
2850 | 2850 | ||
@@ -7451,7 +7451,7 @@ static struct hda_input_mux alc883_lenovo_nb0763_capture_source = { | |||
7451 | .num_items = 4, | 7451 | .num_items = 4, |
7452 | .items = { | 7452 | .items = { |
7453 | { "Mic", 0x0 }, | 7453 | { "Mic", 0x0 }, |
7454 | { "Int Mic", 0x1 }, | 7454 | { "Internal Mic", 0x1 }, |
7455 | { "Line", 0x2 }, | 7455 | { "Line", 0x2 }, |
7456 | { "CD", 0x4 }, | 7456 | { "CD", 0x4 }, |
7457 | }, | 7457 | }, |
@@ -7461,7 +7461,7 @@ static struct hda_input_mux alc883_fujitsu_pi2515_capture_source = { | |||
7461 | .num_items = 2, | 7461 | .num_items = 2, |
7462 | .items = { | 7462 | .items = { |
7463 | { "Mic", 0x0 }, | 7463 | { "Mic", 0x0 }, |
7464 | { "Int Mic", 0x1 }, | 7464 | { "Internal Mic", 0x1 }, |
7465 | }, | 7465 | }, |
7466 | }; | 7466 | }; |
7467 | 7467 | ||
@@ -8824,9 +8824,9 @@ static struct snd_kcontrol_new alc883_clevo_m720_mixer[] = { | |||
8824 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | 8824 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), |
8825 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), | 8825 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), |
8826 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | 8826 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
8827 | HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | 8827 | HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), |
8828 | HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT), | 8828 | HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT), |
8829 | HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 8829 | HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
8830 | { } /* end */ | 8830 | { } /* end */ |
8831 | }; | 8831 | }; |
8832 | 8832 | ||
@@ -8838,9 +8838,9 @@ static struct snd_kcontrol_new alc883_2ch_fujitsu_pi2515_mixer[] = { | |||
8838 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | 8838 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), |
8839 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), | 8839 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), |
8840 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | 8840 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
8841 | HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | 8841 | HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), |
8842 | HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT), | 8842 | HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT), |
8843 | HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 8843 | HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
8844 | { } /* end */ | 8844 | { } /* end */ |
8845 | }; | 8845 | }; |
8846 | 8846 | ||
@@ -8986,18 +8986,18 @@ static struct snd_kcontrol_new alc883_targa_2ch_mixer[] = { | |||
8986 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | 8986 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), |
8987 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), | 8987 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), |
8988 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | 8988 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
8989 | HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | 8989 | HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), |
8990 | HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT), | 8990 | HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT), |
8991 | HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 8991 | HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
8992 | { } /* end */ | 8992 | { } /* end */ |
8993 | }; | 8993 | }; |
8994 | 8994 | ||
8995 | static struct snd_kcontrol_new alc883_targa_8ch_mixer[] = { | 8995 | static struct snd_kcontrol_new alc883_targa_8ch_mixer[] = { |
8996 | HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT), | 8996 | HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT), |
8997 | HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT), | 8997 | HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT), |
8998 | HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | 8998 | HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), |
8999 | HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT), | 8999 | HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT), |
9000 | HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 9000 | HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
9001 | { } /* end */ | 9001 | { } /* end */ |
9002 | }; | 9002 | }; |
9003 | 9003 | ||
@@ -9021,8 +9021,8 @@ static struct snd_kcontrol_new alc883_lenovo_nb0763_mixer[] = { | |||
9021 | HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), | 9021 | HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), |
9022 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | 9022 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), |
9023 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | 9023 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
9024 | HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | 9024 | HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), |
9025 | HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 9025 | HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
9026 | { } /* end */ | 9026 | { } /* end */ |
9027 | }; | 9027 | }; |
9028 | 9028 | ||
@@ -11676,7 +11676,7 @@ static struct hda_input_mux alc262_fujitsu_capture_source = { | |||
11676 | .num_items = 3, | 11676 | .num_items = 3, |
11677 | .items = { | 11677 | .items = { |
11678 | { "Mic", 0x0 }, | 11678 | { "Mic", 0x0 }, |
11679 | { "Int Mic", 0x1 }, | 11679 | { "Internal Mic", 0x1 }, |
11680 | { "CD", 0x4 }, | 11680 | { "CD", 0x4 }, |
11681 | }, | 11681 | }, |
11682 | }; | 11682 | }; |
@@ -11831,9 +11831,9 @@ static struct snd_kcontrol_new alc262_fujitsu_mixer[] = { | |||
11831 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), | 11831 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), |
11832 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | 11832 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), |
11833 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | 11833 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
11834 | HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT), | 11834 | HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT), |
11835 | HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | 11835 | HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), |
11836 | HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 11836 | HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
11837 | { } /* end */ | 11837 | { } /* end */ |
11838 | }; | 11838 | }; |
11839 | 11839 | ||
@@ -11867,9 +11867,9 @@ static struct snd_kcontrol_new alc262_lenovo_3000_mixer[] = { | |||
11867 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), | 11867 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), |
11868 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | 11868 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), |
11869 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | 11869 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
11870 | HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT), | 11870 | HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT), |
11871 | HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | 11871 | HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), |
11872 | HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 11872 | HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
11873 | { } /* end */ | 11873 | { } /* end */ |
11874 | }; | 11874 | }; |
11875 | 11875 | ||
@@ -13248,7 +13248,7 @@ static struct snd_kcontrol_new alc267_quanta_il1_mixer[] = { | |||
13248 | HDA_CODEC_VOLUME("Mic Capture Volume", 0x23, 0x0, HDA_OUTPUT), | 13248 | HDA_CODEC_VOLUME("Mic Capture Volume", 0x23, 0x0, HDA_OUTPUT), |
13249 | HDA_BIND_MUTE("Mic Capture Switch", 0x23, 2, HDA_OUTPUT), | 13249 | HDA_BIND_MUTE("Mic Capture Switch", 0x23, 2, HDA_OUTPUT), |
13250 | HDA_CODEC_VOLUME("Ext Mic Boost", 0x18, 0, HDA_INPUT), | 13250 | HDA_CODEC_VOLUME("Ext Mic Boost", 0x18, 0, HDA_INPUT), |
13251 | HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT), | 13251 | HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT), |
13252 | { } | 13252 | { } |
13253 | }; | 13253 | }; |
13254 | 13254 | ||
@@ -16381,7 +16381,7 @@ static struct hda_input_mux alc861vd_dallas_capture_source = { | |||
16381 | .num_items = 2, | 16381 | .num_items = 2, |
16382 | .items = { | 16382 | .items = { |
16383 | { "Ext Mic", 0x0 }, | 16383 | { "Ext Mic", 0x0 }, |
16384 | { "Int Mic", 0x1 }, | 16384 | { "Internal Mic", 0x1 }, |
16385 | }, | 16385 | }, |
16386 | }; | 16386 | }; |
16387 | 16387 | ||
@@ -16522,7 +16522,7 @@ static struct snd_kcontrol_new alc861vd_lenovo_mixer[] = { | |||
16522 | }; | 16522 | }; |
16523 | 16523 | ||
16524 | /* Pin assignment: Speaker=0x14, HP = 0x15, | 16524 | /* Pin assignment: Speaker=0x14, HP = 0x15, |
16525 | * Ext Mic=0x18, Int Mic = 0x19, CD = 0x1c, PC Beep = 0x1d | 16525 | * Ext Mic=0x18, Internal Mic = 0x19, CD = 0x1c, PC Beep = 0x1d |
16526 | */ | 16526 | */ |
16527 | static struct snd_kcontrol_new alc861vd_dallas_mixer[] = { | 16527 | static struct snd_kcontrol_new alc861vd_dallas_mixer[] = { |
16528 | HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT), | 16528 | HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT), |
@@ -16532,9 +16532,9 @@ static struct snd_kcontrol_new alc861vd_dallas_mixer[] = { | |||
16532 | HDA_CODEC_VOLUME("Ext Mic Boost", 0x18, 0, HDA_INPUT), | 16532 | HDA_CODEC_VOLUME("Ext Mic Boost", 0x18, 0, HDA_INPUT), |
16533 | HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | 16533 | HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), |
16534 | HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | 16534 | HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
16535 | HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT), | 16535 | HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT), |
16536 | HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | 16536 | HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), |
16537 | HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 16537 | HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
16538 | { } /* end */ | 16538 | { } /* end */ |
16539 | }; | 16539 | }; |
16540 | 16540 | ||
@@ -18551,9 +18551,9 @@ static struct snd_kcontrol_new alc272_nc10_mixer[] = { | |||
18551 | HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | 18551 | HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
18552 | HDA_CODEC_VOLUME("Ext Mic Boost", 0x18, 0, HDA_INPUT), | 18552 | HDA_CODEC_VOLUME("Ext Mic Boost", 0x18, 0, HDA_INPUT), |
18553 | 18553 | ||
18554 | HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | 18554 | HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), |
18555 | HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 18555 | HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
18556 | HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT), | 18556 | HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT), |
18557 | { } /* end */ | 18557 | { } /* end */ |
18558 | }; | 18558 | }; |
18559 | 18559 | ||
@@ -19596,7 +19596,7 @@ static struct snd_kcontrol_new alc680_base_mixer[] = { | |||
19596 | HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT), | 19596 | HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT), |
19597 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x4, 0x0, HDA_OUTPUT), | 19597 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x4, 0x0, HDA_OUTPUT), |
19598 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x16, 0x0, HDA_OUTPUT), | 19598 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x16, 0x0, HDA_OUTPUT), |
19599 | HDA_CODEC_VOLUME("Int Mic Boost", 0x12, 0, HDA_INPUT), | 19599 | HDA_CODEC_VOLUME("Internal Mic Boost", 0x12, 0, HDA_INPUT), |
19600 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), | 19600 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), |
19601 | HDA_CODEC_VOLUME("Line In Boost", 0x19, 0, HDA_INPUT), | 19601 | HDA_CODEC_VOLUME("Line In Boost", 0x19, 0, HDA_INPUT), |
19602 | { } | 19602 | { } |