ALSA: HDA VIA: Add 2nd S/PDIF out for VT1708S and VT1702.
PATCH 17/30 ALSA: HDA VIA: Add 2nd S/PDIF out for VT1708S and VT1702.
From: Lydia Wang <[email protected]>
Subject: ALSA: HDA VIA: Add 2nd S/PDIF out for VT1708S and VT1702.
Signed-off-by Lydia Wang <[email protected]>
Signed-off-by Logan Li <[email protected]>
--- sound/pci/hda/patch_via.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-)
sound/pci/hda/patch_via.c +27 -10
@@ -107,7 +107,7 @@/* playback */ struct hda_multi_out multiout; -hda_nid_t slave_dig_outs[2 ]; +hda_nid_t second_dig_out;/* capture */ unsigned int num_adc_nids;
@@ -1179,8 +1179,23 @@ struct snd_pcm_substream *substream) {struct via_spec *spec = codec->spec; -return snd_hda_multi_out_dig_prepare (codec, &spec->multiout, - stream_tag, format, substream); +hda_nid_t nid = substream->number ==0 + ? spec->multiout.dig_out_nid : spec->second_dig_out; +mutex_lock (&codec->spdif_mutex); +/* copy from hda_codec.c: setup_dig_out_stream */ +/* turn off SPDIF once; otherwise the IEC958 bits won't be updated */ +if (codec->spdif_status_reset && (codec->spdif_ctls &AC_DIG1_ENABLE )) +snd_hda_codec_write_cache ( + codec, nid,0 ,AC_VERB_SET_DIGI_CONVERT_1 , + codec->spdif_ctls & ~AC_DIG1_ENABLE &0xff ); +snd_hda_codec_setup_stream (codec, nid, stream_tag,0 , format); +/* turn on again (if needed) */ +if (codec->spdif_status_reset && (codec->spdif_ctls &AC_DIG1_ENABLE )) +snd_hda_codec_write_cache ( + codec, nid,0 ,AC_VERB_SET_DIGI_CONVERT_1 , + codec->spdif_ctls &0xff ); +mutex_unlock (&codec->spdif_mutex); +return 0 ; } static int via_dig_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
@@ -1298,6 +1313,13 @@if (err <0 )return err; spec->multiout.share_spdif =1 ; +/* add second spdif out */ +if (spec->second_dig_out) { + err =snd_hda_create_spdif_out_ctls ( + codec, spec->second_dig_out); +if (err <0 ) +return err; + } }if (spec->dig_in_nid) { err =snd_hda_create_spdif_in_ctls (codec, spec->dig_in_nid);
@@ -1472,11 +1494,6 @@ }else /* enable SPDIF-input pin */ snd_hda_codec_write (codec, spec->autocfg.dig_in_pin,0 ,AC_VERB_SET_PIN_WIDGET_CONTROL ,PIN_IN ); - -/* assign slave outs */ -if (spec->slave_dig_outs[0 ]) - codec->slave_dig_outs = spec->slave_dig_outs; -return 0 ; }
@@ -3164,7 +3181,7 @@ };static struct hda_pcm_stream vt1708S_pcm_digital_playback = { - .substreams =1 , + .substreams =2 , .channels_min =2 , .channels_max =2 ,/* NID is set in via_build_pcms */
@@ -3400,7 +3417,7 @@if (!spec->multiout.dig_out_nid) spec->multiout.dig_out_nid = nid;else { - spec->slave_dig_outs[0 ] = nid; + spec->second_dig_out = nid;break ;/* at most two dig outs */ } }