lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: HDA VIA: Only cosmetic changes

Browse Source 
Signed-off-by: Lydia Wang <lydiawang@viatech.com.cn>
Signed-off-by: Logan Li <loganli@viatech.com.cn>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Lydia Wang
2009-10-10 19:08:55 +08:00
committed by Takashi Iwai
parent 8e86597f3c
commit 377ff31ae0
1 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
sound/pci/hda/patch_via.c
View File

@@ -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 */
/* */ /* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -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)
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
@@ -2162,7 +2164,7 @@ static int vt1708_auto_fill_dac_nids(struct via_spec *spec,
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 */
@@ -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",
@@ -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;
@@ -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",