aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorMichael Karcher <kernel@mkarcher.dialup.fu-berlin.de>2012-04-06 09:34:16 -0400
committerTakashi Iwai <tiwai@suse.de>2012-04-07 06:25:25 -0400
commit3edbbb9ec5621478dc3c3b1c66ecb7d177b35c20 (patch)
tree9eb1ccc0c9134df8d4ccc58461b91e8c75509d61 /sound/pci
parent4f32456e5ed4852abc9b555c887dfb3481ea9cab (diff)
ALSA: hda - Rename capture sources of CX20549 to match common conventions
This includes renaming "Line In" to line, also in the mixer settings. Signed-off-by: Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_conexant.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 368617abab4c..c0a3a17edd86 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -686,27 +686,27 @@ static const struct hda_channel_mode cxt5045_modes[1] = {
686static const struct hda_input_mux cxt5045_capture_source = { 686static const struct hda_input_mux cxt5045_capture_source = {
687 .num_items = 2, 687 .num_items = 2,
688 .items = { 688 .items = {
689 { "IntMic", 0x1 }, 689 { "Internal Mic", 0x1 },
690 { "ExtMic", 0x2 }, 690 { "Mic", 0x2 },
691 } 691 }
692}; 692};
693 693
694static const struct hda_input_mux cxt5045_capture_source_benq = { 694static const struct hda_input_mux cxt5045_capture_source_benq = {
695 .num_items = 5, 695 .num_items = 5,
696 .items = { 696 .items = {
697 { "IntMic", 0x1 }, 697 { "CD", 0x4 },
698 { "ExtMic", 0x2 }, 698 { "Internal Mic", 0x1 },
699 { "LineIn", 0x3 }, 699 { "Mic", 0x2 },
700 { "CD", 0x4 }, 700 { "Line", 0x3 },
701 { "Mixer", 0x0 }, 701 { "Mixer", 0x0 },
702 } 702 }
703}; 703};
704 704
705static const struct hda_input_mux cxt5045_capture_source_hp530 = { 705static const struct hda_input_mux cxt5045_capture_source_hp530 = {
706 .num_items = 2, 706 .num_items = 2,
707 .items = { 707 .items = {
708 { "ExtMic", 0x1 }, 708 { "Mic", 0x1 },
709 { "IntMic", 0x2 }, 709 { "Internal Mic", 0x2 },
710 } 710 }
711}; 711};
712 712
@@ -826,10 +826,10 @@ static const struct snd_kcontrol_new cxt5045_benq_mixers[] = {
826 HDA_CODEC_VOLUME("CD Playback Volume", 0x17, 0x4, HDA_INPUT), 826 HDA_CODEC_VOLUME("CD Playback Volume", 0x17, 0x4, HDA_INPUT),
827 HDA_CODEC_MUTE("CD Playback Switch", 0x17, 0x4, HDA_INPUT), 827 HDA_CODEC_MUTE("CD Playback Switch", 0x17, 0x4, HDA_INPUT),
828 828
829 HDA_CODEC_VOLUME("Line In Capture Volume", 0x1a, 0x03, HDA_INPUT), 829 HDA_CODEC_VOLUME("Line Capture Volume", 0x1a, 0x03, HDA_INPUT),
830 HDA_CODEC_MUTE("Line In Capture Switch", 0x1a, 0x03, HDA_INPUT), 830 HDA_CODEC_MUTE("Line Capture Switch", 0x1a, 0x03, HDA_INPUT),
831 HDA_CODEC_VOLUME("Line In Playback Volume", 0x17, 0x3, HDA_INPUT), 831 HDA_CODEC_VOLUME("Line Playback Volume", 0x17, 0x3, HDA_INPUT),
832 HDA_CODEC_MUTE("Line In Playback Switch", 0x17, 0x3, HDA_INPUT), 832 HDA_CODEC_MUTE("Line Playback Switch", 0x17, 0x3, HDA_INPUT),
833 833
834 HDA_CODEC_VOLUME("Mixer Capture Volume", 0x1a, 0x0, HDA_INPUT), 834 HDA_CODEC_VOLUME("Mixer Capture Volume", 0x1a, 0x0, HDA_INPUT),
835 HDA_CODEC_MUTE("Mixer Capture Switch", 0x1a, 0x0, HDA_INPUT), 835 HDA_CODEC_MUTE("Mixer Capture Switch", 0x1a, 0x0, HDA_INPUT),