Commit 17e7aec680a252ec0cea6d886d3983319af43ac4
Committed by
Jaroslav Kysela
Jaroslav Kysela
1 parent
2a578f3b4c
Exists in
master
and in
20 other branches
[ALSA] HDA/ALC260: 1/7 - Fix test model input mux label
Modules: HDA Codec driver This patch fixes input mux labels used for the ALC260 'test' model. This is needed to avoid confusion which comes about because the two ADCs in the ALC260 have slightly different mappings for their input selectors. Since this is just the test model it's sufficient to simply report both options where they exist. If a model comes along for which this becomes an issue, the ALC260 input mux code will have to be extended to allow different mux layouts for different ADCs. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Showing 1 changed file with 15 additions and 5 deletions Side-by-side Diff
sound/pci/hda/patch_realtek.c
| ... | ... | @@ -2414,8 +2414,8 @@ |
| 2414 | 2414 | }, |
| 2415 | 2415 | }; |
| 2416 | 2416 | |
| 2417 | -/* On Fujitsu S702x laptops capture only makes sense from Mic/LineIn jack | |
| 2418 | - * and the internal CD lines. | |
| 2417 | +/* On Fujitsu S702x laptops capture only makes sense from Mic/LineIn jack, | |
| 2418 | + * headphone jack and the internal CD lines. | |
| 2419 | 2419 | */ |
| 2420 | 2420 | static struct hda_input_mux alc260_fujitsu_capture_source = { |
| 2421 | 2421 | .num_items = 3, |
| 2422 | 2422 | |
| 2423 | 2423 | |
| ... | ... | @@ -2790,16 +2790,26 @@ |
| 2790 | 2790 | static hda_nid_t alc260_test_adc_nids[2] = { |
| 2791 | 2791 | 0x04, 0x05, |
| 2792 | 2792 | }; |
| 2793 | +/* This is a bit messy since the two input muxes in the ALC260 have slight | |
| 2794 | + * variations in their signal assignments. The ideal way to deal with this | |
| 2795 | + * is to extend alc_spec.input_mux to allow a different input MUX for each | |
| 2796 | + * ADC. For the purposes of the test model it's sufficient to just list | |
| 2797 | + * both options for affected signal indices. The separate input mux | |
| 2798 | + * functionality only needs to be considered if a model comes along which | |
| 2799 | + * actually uses signals 0x5, 0x6 and 0x7 for something which makes sense to | |
| 2800 | + * record. | |
| 2801 | + */ | |
| 2793 | 2802 | static struct hda_input_mux alc260_test_capture_source = { |
| 2794 | - .num_items = 7, | |
| 2803 | + .num_items = 8, | |
| 2795 | 2804 | .items = { |
| 2796 | 2805 | { "MIC1 pin", 0x0 }, |
| 2797 | 2806 | { "MIC2 pin", 0x1 }, |
| 2798 | 2807 | { "LINE1 pin", 0x2 }, |
| 2799 | 2808 | { "LINE2 pin", 0x3 }, |
| 2800 | 2809 | { "CD pin", 0x4 }, |
| 2801 | - { "LINE-OUT pin", 0x5 }, | |
| 2802 | - { "HP-OUT pin", 0x6 }, | |
| 2810 | + { "LINE-OUT pin (cap1), Mixer (cap2)", 0x5 }, | |
| 2811 | + { "HP-OUT pin (cap1), LINE-OUT pin (cap2)", 0x6 }, | |
| 2812 | + { "HP-OUT pin (cap2 only)", 0x7 }, | |
| 2803 | 2813 | }, |
| 2804 | 2814 | }; |
| 2805 | 2815 | static struct snd_kcontrol_new alc260_test_mixer[] = { |