Commit d57fdac0691d500d5c697e452f769335b22a75e3
Committed by
Jaroslav Kysela
Jaroslav Kysela
1 parent
cdcd9268a1
Exists in
master
and in
20 other branches
[ALSA] HDA/ALC260: 3/7 - generalise some structures
Modules: HDA Codec driver This patch generalises a structure added for the 'fujitsu' model but which is potentially useful for other models as well. It turns the 'alc260_fujitsu_adc_nids' array into 'alc260_dual_adc_nids'; for other models which decide to utilise the dual ADC functionality there's really no reason why they need to define their own list of ADC nids. The 'fujitsu' model preset is adjusted accordingly. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Showing 1 changed file with 6 additions and 3 deletions Side-by-side Diff
sound/pci/hda/patch_realtek.c
| ... | ... | @@ -2419,7 +2419,10 @@ |
| 2419 | 2419 | 0x05, 0x04 |
| 2420 | 2420 | }; |
| 2421 | 2421 | |
| 2422 | -static hda_nid_t alc260_fujitsu_adc_nids[2] = { | |
| 2422 | +/* NIDs used when simultaneous access to both ADCs makes sense. Note that | |
| 2423 | + * alc260_capture_mixer assumes ADC0 (nid 0x04) is the first ADC. | |
| 2424 | + */ | |
| 2425 | +static hda_nid_t alc260_dual_adc_nids[2] = { | |
| 2423 | 2426 | /* ADC0, ADC1 */ |
| 2424 | 2427 | 0x04, 0x05 |
| 2425 | 2428 | }; |
| ... | ... | @@ -3285,8 +3288,8 @@ |
| 3285 | 3288 | .init_verbs = { alc260_fujitsu_init_verbs }, |
| 3286 | 3289 | .num_dacs = ARRAY_SIZE(alc260_dac_nids), |
| 3287 | 3290 | .dac_nids = alc260_dac_nids, |
| 3288 | - .num_adc_nids = ARRAY_SIZE(alc260_fujitsu_adc_nids), | |
| 3289 | - .adc_nids = alc260_fujitsu_adc_nids, | |
| 3291 | + .num_adc_nids = ARRAY_SIZE(alc260_dual_adc_nids), | |
| 3292 | + .adc_nids = alc260_dual_adc_nids, | |
| 3290 | 3293 | .num_channel_mode = ARRAY_SIZE(alc260_modes), |
| 3291 | 3294 | .channel_mode = alc260_modes, |
| 3292 | 3295 | .input_mux = &alc260_fujitsu_capture_source, |