Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 02:05:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ALSA: hda: 83xxx port 0xe DAC selection

Browse Source 
On the 92hd8xxx codecs port 0xe needs the connection selected to be the
last DAC in the list.

Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Matthew Ranostay 2009-01-20 16:50:25 -05:00 committed by Takashi Iwai
parent 989738c4f8
commit 65557f3507
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sound/pci/hda/patch_sigmatel.c
View File

@ -841,10 +841,6 @@ static struct hda_verb stac92hd73xx_10ch_core_init[] = {
}; };
static struct hda_verb stac92hd83xxx_core_init[] = { static struct hda_verb stac92hd83xxx_core_init[] = {
/* start of config #1 */
{ 0xe, AC_VERB_SET_CONNECT_SEL, 0x3},
/* start of config #2 */
{ 0xa, AC_VERB_SET_CONNECT_SEL, 0x0}, { 0xa, AC_VERB_SET_CONNECT_SEL, 0x0},
{ 0xb, AC_VERB_SET_CONNECT_SEL, 0x0}, { 0xb, AC_VERB_SET_CONNECT_SEL, 0x0},
{ 0xd, AC_VERB_SET_CONNECT_SEL, 0x1}, { 0xd, AC_VERB_SET_CONNECT_SEL, 0x1},
@ -4754,7 +4750,9 @@ static struct hda_input_mux stac92hd83xxx_dmux = {
static int patch_stac92hd83xxx(struct hda_codec *codec) static int patch_stac92hd83xxx(struct hda_codec *codec)
{ {
struct sigmatel_spec *spec; struct sigmatel_spec *spec;
hda_nid_t conn[STAC92HD83_DAC_COUNT + 1];
int err; int err;
int num_dacs;
spec = kzalloc(sizeof(*spec), GFP_KERNEL); spec = kzalloc(sizeof(*spec), GFP_KERNEL);
if (spec == NULL) if (spec == NULL)
@ -4773,13 +4771,21 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
spec->num_pwrs = ARRAY_SIZE(stac92hd83xxx_pwr_nids); spec->num_pwrs = ARRAY_SIZE(stac92hd83xxx_pwr_nids);
spec->multiout.dac_nids = spec->dac_nids; spec->multiout.dac_nids = spec->dac_nids;
/* set port 0xe to select the last DAC
*/
num_dacs = snd_hda_get_connections(codec, 0x0e,
conn, STAC92HD83_DAC_COUNT + 1) - 1;
snd_hda_codec_write_cache(codec, 0xe, 0,
AC_VERB_SET_CONNECT_SEL, num_dacs);
spec->init = stac92hd83xxx_core_init; spec->init = stac92hd83xxx_core_init;
switch (codec->vendor_id) { switch (codec->vendor_id) {
case 0x111d7605: case 0x111d7605:
break; break;
default: default:
spec->num_pwrs--; spec->num_pwrs--;
spec->init++; /* switch to config #2 */
} }
spec->mixer = stac92hd83xxx_mixer; spec->mixer = stac92hd83xxx_mixer;