Skip to content

L
linux
Commit 377ff31a authored by Lydia Wang's avatar Lydia Wang Committed by Takashi Iwai
Browse files
Options

ALSA: HDA VIA: Only cosmetic changes 

Signed-off-by: default avatarLydia Wang <lydiawang@viatech.com.cn>
Signed-off-by: default avatarLogan Li <loganli@viatech.com.cn>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 8e86597f
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 31 deletions
sound/pci/hda/patch_via.c
View file @ 377ff31a
...@@ -22,26 +22,26 @@ ...@@ -22,26 +22,26 @@
*/ */
/* * * * * * * * * * * * * * Release History * * * * * * * * * * * * * * * * */ /* * * * * * * * * * * * * * Release History * * * * * * * * * * * * * * * * */
/* */ /* */
/* 2006-03-03 Lydia Wang Create the basic patch to support VT1708 codec */ /* 2006-03-03 Lydia Wang Create the basic patch to support VT1708 codec */
/* 2006-03-14 Lydia Wang Modify hard code for some pin widget nid */ /* 2006-03-14 Lydia Wang Modify hard code for some pin widget nid */
/* 2006-08-02 Lydia Wang Add support to VT1709 codec */ /* 2006-08-02 Lydia Wang Add support to VT1709 codec */
/* 2006-09-08 Lydia Wang Fix internal loopback recording source select bug */ /* 2006-09-08 Lydia Wang Fix internal loopback recording source select bug */
/* 2007-09-12 Lydia Wang Add EAPD enable during driver initialization */ /* 2007-09-12 Lydia Wang Add EAPD enable during driver initialization */
/* 2007-09-17 Lydia Wang Add VT1708B codec support */ /* 2007-09-17 Lydia Wang Add VT1708B codec support */
/* 2007-11-14 Lydia Wang Add VT1708A codec HP and CD pin connect config */ /* 2007-11-14 Lydia Wang Add VT1708A codec HP and CD pin connect config */
/* 2008-02-03 Lydia Wang Fix Rear channels and Back channels inverse issue */ /* 2008-02-03 Lydia Wang Fix Rear channels and Back channels inverse issue */
/* 2008-03-06 Lydia Wang Add VT1702 codec and VT1708S codec support */ /* 2008-03-06 Lydia Wang Add VT1702 codec and VT1708S codec support */
/* 2008-04-09 Lydia Wang Add mute front speaker when HP plugin */ /* 2008-04-09 Lydia Wang Add mute front speaker when HP plugin */
/* 2008-04-09 Lydia Wang Add Independent HP feature */ /* 2008-04-09 Lydia Wang Add Independent HP feature */
/* 2008-05-28 Lydia Wang Add second S/PDIF Out support for VT1702 */ /* 2008-05-28 Lydia Wang Add second S/PDIF Out support for VT1702 */
/* 2008-09-15 Logan Li Add VT1708S Mic Boost workaround/backdoor */ /* 2008-09-15 Logan Li Add VT1708S Mic Boost workaround/backdoor */
/* 2009-02-16 Logan Li Add support for VT1718S */ /* 2009-02-16 Logan Li Add support for VT1718S */
/* 2009-03-13 Logan Li Add support for VT1716S */ /* 2009-03-13 Logan Li Add support for VT1716S */
/* 2009-04-14 Lydai Wang Add support for VT1828S and VT2020 */ /* 2009-04-14 Lydai Wang Add support for VT1828S and VT2020 */
/* 2009-07-08 Lydia Wang Add support for VT2002P */ /* 2009-07-08 Lydia Wang Add support for VT2002P */
/* 2009-07-21 Lydia Wang Add support for VT1812 */ /* 2009-07-21 Lydia Wang Add support for VT1812 */
/* */ /* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
...@@ -486,7 +486,7 @@ static void via_auto_set_output_and_unmute(struct hda_codec *codec, ...@@ -486,7 +486,7 @@ static void via_auto_set_output_and_unmute(struct hda_codec *codec,
snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
AMP_OUT_UNMUTE); AMP_OUT_UNMUTE);
if (snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_EAPD) if (snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_EAPD)
snd_hda_codec_write(codec, nid, 0, snd_hda_codec_write(codec, nid, 0,
AC_VERB_SET_EAPD_BTLENABLE, 0x02); AC_VERB_SET_EAPD_BTLENABLE, 0x02);
} }
...@@ -1545,7 +1545,7 @@ static struct hda_verb vt1708_volume_init_verbs[] = { ...@@ -1545,7 +1545,7 @@ static struct hda_verb vt1708_volume_init_verbs[] = {
{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
/* Setup default input MW0 to PW4 */ /* Setup default input MW0 to PW4 */
{0x20, AC_VERB_SET_CONNECT_SEL, 0}, {0x20, AC_VERB_SET_CONNECT_SEL, 0},
/* PW9 Output enable */ /* PW9 Output enable */
...@@ -1865,8 +1865,10 @@ static int via_build_pcms(struct hda_codec *codec) ...@@ -1865,8 +1865,10 @@ static int via_build_pcms(struct hda_codec *codec)
codec->pcm_info = info; codec->pcm_info = info;
info->name = spec->stream_name_analog; info->name = spec->stream_name_analog;
info->stream[SNDRV_PCM_STREAM_PLAYBACK] = *(spec->stream_analog_playback); info->stream[SNDRV_PCM_STREAM_PLAYBACK] =
info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dac_nids[0]; *(spec->stream_analog_playback);
info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid =
spec->multiout.dac_nids[0];
info->stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec->stream_analog_capture); info->stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec->stream_analog_capture);
info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0]; info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0];
...@@ -2116,7 +2118,7 @@ static int via_init(struct hda_codec *codec) ...@@ -2116,7 +2118,7 @@ static int via_init(struct hda_codec *codec)
if (spec->slave_dig_outs[0]) if (spec->slave_dig_outs[0])
codec->slave_dig_outs = spec->slave_dig_outs; codec->slave_dig_outs = spec->slave_dig_outs;
return 0; return 0;
} }
#ifdef SND_HDA_NEEDS_RESUME #ifdef SND_HDA_NEEDS_RESUME
...@@ -2161,8 +2163,8 @@ static int vt1708_auto_fill_dac_nids(struct via_spec *spec, ...@@ -2161,8 +2163,8 @@ static int vt1708_auto_fill_dac_nids(struct via_spec *spec,
spec->multiout.num_dacs = cfg->line_outs; spec->multiout.num_dacs = cfg->line_outs;
spec->multiout.dac_nids = spec->private_dac_nids; spec->multiout.dac_nids = spec->private_dac_nids;
for(i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
nid = cfg->line_out_pins[i]; nid = cfg->line_out_pins[i];
if (nid) { if (nid) {
/* config dac list */ /* config dac list */
...@@ -2200,7 +2202,7 @@ static int vt1708_auto_create_multi_out_ctls(struct via_spec *spec, ...@@ -2200,7 +2202,7 @@ static int vt1708_auto_create_multi_out_ctls(struct via_spec *spec,
if (!nid) if (!nid)
continue; continue;
nid_vol = nid_vols[i]; nid_vol = nid_vols[i];
if (i == AUTO_SEQ_CENLFE) { if (i == AUTO_SEQ_CENLFE) {
...@@ -2229,7 +2231,7 @@ static int vt1708_auto_create_multi_out_ctls(struct via_spec *spec, ...@@ -2229,7 +2231,7 @@ static int vt1708_auto_create_multi_out_ctls(struct via_spec *spec,
HDA_OUTPUT)); HDA_OUTPUT));
if (err < 0) if (err < 0)
return err; return err;
} else if (i == AUTO_SEQ_FRONT){ } else if (i == AUTO_SEQ_FRONT) {
/* add control to mixer index 0 */ /* add control to mixer index 0 */
err = via_add_control(spec, VIA_CTL_WIDGET_VOL, err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
"Master Front Playback Volume", "Master Front Playback Volume",
...@@ -2243,7 +2245,7 @@ static int vt1708_auto_create_multi_out_ctls(struct via_spec *spec, ...@@ -2243,7 +2245,7 @@ static int vt1708_auto_create_multi_out_ctls(struct via_spec *spec,
HDA_INPUT)); HDA_INPUT));
if (err < 0) if (err < 0)
return err; return err;
/* add control to PW3 */ /* add control to PW3 */
sprintf(name, "%s Playback Volume", chname[i]); sprintf(name, "%s Playback Volume", chname[i]);
err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name, err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,
...@@ -2343,7 +2345,7 @@ static int vt1708_auto_create_analog_input_ctls(struct via_spec *spec, ...@@ -2343,7 +2345,7 @@ static int vt1708_auto_create_analog_input_ctls(struct via_spec *spec,
case 0x1d: /* Mic */ case 0x1d: /* Mic */
idx = 2; idx = 2;
break; break;
case 0x1e: /* Line In */ case 0x1e: /* Line In */
idx = 3; idx = 3;
break; break;
...@@ -2576,7 +2578,7 @@ static int patch_vt1708(struct hda_codec *codec) ...@@ -2576,7 +2578,7 @@ static int patch_vt1708(struct hda_codec *codec)
"from BIOS. Using genenic mode...\n"); "from BIOS. Using genenic mode...\n");
} }
spec->stream_name_analog = "VT1708 Analog"; spec->stream_name_analog = "VT1708 Analog";
spec->stream_analog_playback = &vt1708_pcm_analog_playback; spec->stream_analog_playback = &vt1708_pcm_analog_playback;
/* disable 32bit format on VT1708 */ /* disable 32bit format on VT1708 */
...@@ -2588,7 +2590,7 @@ static int patch_vt1708(struct hda_codec *codec) ...@@ -2588,7 +2590,7 @@ static int patch_vt1708(struct hda_codec *codec)
spec->stream_digital_playback = &vt1708_pcm_digital_playback; spec->stream_digital_playback = &vt1708_pcm_digital_playback;
spec->stream_digital_capture = &vt1708_pcm_digital_capture; spec->stream_digital_capture = &vt1708_pcm_digital_capture;
if (!spec->adc_nids && spec->input_mux) { if (!spec->adc_nids && spec->input_mux) {
spec->adc_nids = vt1708_adc_nids; spec->adc_nids = vt1708_adc_nids;
spec->num_adc_nids = ARRAY_SIZE(vt1708_adc_nids); spec->num_adc_nids = ARRAY_SIZE(vt1708_adc_nids);
...@@ -2775,11 +2777,11 @@ static int vt1709_auto_fill_dac_nids(struct via_spec *spec, ...@@ -2775,11 +2777,11 @@ static int vt1709_auto_fill_dac_nids(struct via_spec *spec,
spec->multiout.dac_nids[cfg->line_outs] = 0x28; /* AOW4 */ spec->multiout.dac_nids[cfg->line_outs] = 0x28; /* AOW4 */
} else if (cfg->line_outs == 3) { /* 6 channels */ } else if (cfg->line_outs == 3) { /* 6 channels */
for(i = 0; i < cfg->line_outs; i++) { for (i = 0; i < cfg->line_outs; i++) {
nid = cfg->line_out_pins[i]; nid = cfg->line_out_pins[i];
if (nid) { if (nid) {
/* config dac list */ /* config dac list */
switch(i) { switch (i) {
case AUTO_SEQ_FRONT: case AUTO_SEQ_FRONT:
/* AOW0 */ /* AOW0 */
spec->multiout.dac_nids[i] = 0x10; spec->multiout.dac_nids[i] = 0x10;
...@@ -2814,7 +2816,7 @@ static int vt1709_auto_create_multi_out_ctls(struct via_spec *spec, ...@@ -2814,7 +2816,7 @@ static int vt1709_auto_create_multi_out_ctls(struct via_spec *spec,
for (i = 0; i <= AUTO_SEQ_SIDE; i++) { for (i = 0; i <= AUTO_SEQ_SIDE; i++) {
nid = cfg->line_out_pins[i]; nid = cfg->line_out_pins[i];
if (!nid) if (!nid)
continue; continue;
nid_vol = nid_vols[i]; nid_vol = nid_vols[i];
...@@ -2845,7 +2847,7 @@ static int vt1709_auto_create_multi_out_ctls(struct via_spec *spec, ...@@ -2845,7 +2847,7 @@ static int vt1709_auto_create_multi_out_ctls(struct via_spec *spec,
HDA_OUTPUT)); HDA_OUTPUT));
if (err < 0) if (err < 0)
return err; return err;
} else if (i == AUTO_SEQ_FRONT){ } else if (i == AUTO_SEQ_FRONT) {
/* ADD control to mixer index 0 */ /* ADD control to mixer index 0 */
err = via_add_control(spec, VIA_CTL_WIDGET_VOL, err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
"Master Front Playback Volume", "Master Front Playback Volume",
...@@ -2859,7 +2861,7 @@ static int vt1709_auto_create_multi_out_ctls(struct via_spec *spec, ...@@ -2859,7 +2861,7 @@ static int vt1709_auto_create_multi_out_ctls(struct via_spec *spec,
HDA_INPUT)); HDA_INPUT));
if (err < 0) if (err < 0)
return err; return err;
/* add control to PW3 */ /* add control to PW3 */
sprintf(name, "%s Playback Volume", chname[i]); sprintf(name, "%s Playback Volume", chname[i]);
err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name, err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,
...@@ -2955,7 +2957,7 @@ static int vt1709_auto_create_analog_input_ctls(struct via_spec *spec, ...@@ -2955,7 +2957,7 @@ static int vt1709_auto_create_analog_input_ctls(struct via_spec *spec,
case 0x1d: /* Mic */ case 0x1d: /* Mic */
idx = 2; idx = 2;
break; break;
case 0x1e: /* Line In */ case 0x1e: /* Line In */
idx = 3; idx = 3;
break; break;
...@@ -3064,7 +3066,7 @@ static int patch_vt1709_10ch(struct hda_codec *codec) ...@@ -3064,7 +3066,7 @@ static int patch_vt1709_10ch(struct hda_codec *codec)
spec->stream_digital_playback = &vt1709_pcm_digital_playback; spec->stream_digital_playback = &vt1709_pcm_digital_playback;
spec->stream_digital_capture = &vt1709_pcm_digital_capture; spec->stream_digital_capture = &vt1709_pcm_digital_capture;
if (!spec->adc_nids && spec->input_mux) { if (!spec->adc_nids && spec->input_mux) {
spec->adc_nids = vt1709_adc_nids; spec->adc_nids = vt1709_adc_nids;
spec->num_adc_nids = ARRAY_SIZE(vt1709_adc_nids); spec->num_adc_nids = ARRAY_SIZE(vt1709_adc_nids);
...@@ -3158,7 +3160,7 @@ static int patch_vt1709_6ch(struct hda_codec *codec) ...@@ -3158,7 +3160,7 @@ static int patch_vt1709_6ch(struct hda_codec *codec)
spec->stream_digital_playback = &vt1709_pcm_digital_playback; spec->stream_digital_playback = &vt1709_pcm_digital_playback;
spec->stream_digital_capture = &vt1709_pcm_digital_capture; spec->stream_digital_capture = &vt1709_pcm_digital_capture;
if (!spec->adc_nids && spec->input_mux) { if (!spec->adc_nids && spec->input_mux) {
spec->adc_nids = vt1709_adc_nids; spec->adc_nids = vt1709_adc_nids;
spec->num_adc_nids = ARRAY_SIZE(vt1709_adc_nids); spec->num_adc_nids = ARRAY_SIZE(vt1709_adc_nids);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7