From ca70db1466bfab61ec51e6bd0efae57e239d39ad Mon Sep 17 00:00:00 2001 From: Jerone Young Date: Mon, 7 Jan 2008 12:22:18 +0100 Subject: [PATCH] --- yaml --- r: 81583 b: refs/heads/master c: ebf00c54a6e1be0ae25d41236a063747c74ed5bf h: refs/heads/master i: 81581: 21c80887467b783b524c86df03f5fd457bf1895e 81579: 620357b308446e27a181203761a1c0bdb697645b 81575: ff1e3b8b4dd52d3c232e9fef2e3e5e51e8f8d359 81567: 36213c1013199fb81f504c8134f0c3f8a040f9de v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_analog.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a41e241c3c69..ef11019ffe19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c481fca3e68155459e9805dc8c303e012ccbee54 +refs/heads/master: ebf00c54a6e1be0ae25d41236a063747c74ed5bf diff --git a/trunk/sound/pci/hda/patch_analog.c b/trunk/sound/pci/hda/patch_analog.c index 0fa5f00edb5c..67144dce90d7 100644 --- a/trunk/sound/pci/hda/patch_analog.c +++ b/trunk/sound/pci/hda/patch_analog.c @@ -3095,6 +3095,16 @@ static struct snd_kcontrol_new ad1984_thinkpad_mixers[] = { .get = ad198x_mux_enum_get, .put = ad198x_mux_enum_put, }, + /* SPDIF controls */ + HDA_CODEC_VOLUME("IEC958 Playback Volume", 0x1b, 0x0, HDA_OUTPUT), + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source", + /* identical with ad1983 */ + .info = ad1983_spdif_route_info, + .get = ad1983_spdif_route_get, + .put = ad1983_spdif_route_put, + }, { } /* end */ }; @@ -3197,7 +3207,7 @@ static int patch_ad1984(struct hda_codec *codec) codec->patch_ops.build_pcms = ad1984_build_pcms; break; case AD1984_THINKPAD: - spec->multiout.dig_out_nid = 0; + spec->multiout.dig_out_nid = AD1884_SPDIF_OUT; spec->input_mux = &ad1984_thinkpad_capture_source; spec->mixers[0] = ad1984_thinkpad_mixers; spec->init_verbs[spec->num_init_verbs++] = ad1984_thinkpad_init_verbs;