diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-11 05:35:15 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-11 18:04:19 -0500 |
| commit | 0852d7a654f75d22a3c09fd7da4a3551bbb37740 (patch) | |
| tree | 36cb4ec6ddd8a5b2ffa06e4d951282b3435b371b /sound/pci/hda/patch_via.c | |
| parent | 32d2c7fa1344ddf51886eddf31e228d139501dc6 (diff) | |
ALSA: hda - Detect multiple digital-out pins
Detect multiple digital-out pins in snd_hda_parse_pin_defconfig().
The dig_out_pin and dig_out_type fields become arrays.
The codec parser still doesn't use this multiple pins detection, though.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_via.c')
| -rw-r--r-- | sound/pci/hda/patch_via.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index c761394cbe84..639b2ff510a6 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c | |||
| @@ -1354,7 +1354,7 @@ static int vt1708_parse_auto_config(struct hda_codec *codec) | |||
| 1354 | 1354 | ||
| 1355 | spec->multiout.max_channels = spec->multiout.num_dacs * 2; | 1355 | spec->multiout.max_channels = spec->multiout.num_dacs * 2; |
| 1356 | 1356 | ||
| 1357 | if (spec->autocfg.dig_out_pin) | 1357 | if (spec->autocfg.dig_outs) |
| 1358 | spec->multiout.dig_out_nid = VT1708_DIGOUT_NID; | 1358 | spec->multiout.dig_out_nid = VT1708_DIGOUT_NID; |
| 1359 | if (spec->autocfg.dig_in_pin) | 1359 | if (spec->autocfg.dig_in_pin) |
| 1360 | spec->dig_in_nid = VT1708_DIGIN_NID; | 1360 | spec->dig_in_nid = VT1708_DIGIN_NID; |
| @@ -1827,7 +1827,7 @@ static int vt1709_parse_auto_config(struct hda_codec *codec) | |||
| 1827 | 1827 | ||
| 1828 | spec->multiout.max_channels = spec->multiout.num_dacs * 2; | 1828 | spec->multiout.max_channels = spec->multiout.num_dacs * 2; |
| 1829 | 1829 | ||
| 1830 | if (spec->autocfg.dig_out_pin) | 1830 | if (spec->autocfg.dig_outs) |
| 1831 | spec->multiout.dig_out_nid = VT1709_DIGOUT_NID; | 1831 | spec->multiout.dig_out_nid = VT1709_DIGOUT_NID; |
| 1832 | if (spec->autocfg.dig_in_pin) | 1832 | if (spec->autocfg.dig_in_pin) |
| 1833 | spec->dig_in_nid = VT1709_DIGIN_NID; | 1833 | spec->dig_in_nid = VT1709_DIGIN_NID; |
| @@ -2371,7 +2371,7 @@ static int vt1708B_parse_auto_config(struct hda_codec *codec) | |||
| 2371 | 2371 | ||
| 2372 | spec->multiout.max_channels = spec->multiout.num_dacs * 2; | 2372 | spec->multiout.max_channels = spec->multiout.num_dacs * 2; |
| 2373 | 2373 | ||
| 2374 | if (spec->autocfg.dig_out_pin) | 2374 | if (spec->autocfg.dig_outs) |
| 2375 | spec->multiout.dig_out_nid = VT1708B_DIGOUT_NID; | 2375 | spec->multiout.dig_out_nid = VT1708B_DIGOUT_NID; |
| 2376 | if (spec->autocfg.dig_in_pin) | 2376 | if (spec->autocfg.dig_in_pin) |
| 2377 | spec->dig_in_nid = VT1708B_DIGIN_NID; | 2377 | spec->dig_in_nid = VT1708B_DIGIN_NID; |
| @@ -2836,7 +2836,7 @@ static int vt1708S_parse_auto_config(struct hda_codec *codec) | |||
| 2836 | 2836 | ||
| 2837 | spec->multiout.max_channels = spec->multiout.num_dacs * 2; | 2837 | spec->multiout.max_channels = spec->multiout.num_dacs * 2; |
| 2838 | 2838 | ||
| 2839 | if (spec->autocfg.dig_out_pin) | 2839 | if (spec->autocfg.dig_outs) |
| 2840 | spec->multiout.dig_out_nid = VT1708S_DIGOUT_NID; | 2840 | spec->multiout.dig_out_nid = VT1708S_DIGOUT_NID; |
| 2841 | 2841 | ||
| 2842 | spec->extra_dig_out_nid = 0x15; | 2842 | spec->extra_dig_out_nid = 0x15; |
| @@ -3155,7 +3155,7 @@ static int vt1702_parse_auto_config(struct hda_codec *codec) | |||
| 3155 | 3155 | ||
| 3156 | spec->multiout.max_channels = spec->multiout.num_dacs * 2; | 3156 | spec->multiout.max_channels = spec->multiout.num_dacs * 2; |
| 3157 | 3157 | ||
| 3158 | if (spec->autocfg.dig_out_pin) | 3158 | if (spec->autocfg.dig_outs) |
| 3159 | spec->multiout.dig_out_nid = VT1702_DIGOUT_NID; | 3159 | spec->multiout.dig_out_nid = VT1702_DIGOUT_NID; |
| 3160 | 3160 | ||
| 3161 | spec->extra_dig_out_nid = 0x1B; | 3161 | spec->extra_dig_out_nid = 0x1B; |