提交 71443b0b 编写于 作者: T Takashi Iwai

ALSA: hda - No analog mix input source as default for IDT92HD71bxx

The analog mix is disabled now as default (unless "analog_mixer" hint
is given), so it shoudn't appear in the digital input source as well.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 15b4f296
...@@ -5481,8 +5481,6 @@ static int patch_stac92hd71bxx(struct hda_codec *codec) ...@@ -5481,8 +5481,6 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)
} }
break; break;
case 0x111d7608: /* 5 Port with Analog Mixer */ case 0x111d7608: /* 5 Port with Analog Mixer */
memcpy(&spec->private_dimux, &stac92hd71bxx_dmux_amixer,
sizeof(stac92hd71bxx_dmux_amixer));
spec->private_dimux.num_items--; spec->private_dimux.num_items--;
switch (spec->board_config) { switch (spec->board_config) {
case STAC_HP_M4: case STAC_HP_M4:
...@@ -5505,9 +5503,15 @@ static int patch_stac92hd71bxx(struct hda_codec *codec) ...@@ -5505,9 +5503,15 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)
/* no output amps */ /* no output amps */
spec->num_pwrs = 0; spec->num_pwrs = 0;
if (snd_hda_get_bool_hint(codec, "analog_mixer") == 1) if (snd_hda_get_bool_hint(codec, "analog_mixer") == 1) {
spec->mixer = stac92hd71bxx_analog_mixer; spec->mixer = stac92hd71bxx_analog_mixer;
memcpy(&spec->private_dimux, &stac92hd71bxx_dmux_amixer,
sizeof(stac92hd71bxx_dmux_amixer));
} else {
memcpy(&spec->private_dimux,
&stac92hd71bxx_dmux_nomixer,
sizeof(stac92hd71bxx_dmux_nomixer));
}
/* disable VSW */ /* disable VSW */
spec->init = stac92hd71bxx_core_init; spec->init = stac92hd71bxx_core_init;
unmute_init++; unmute_init++;
...@@ -5531,10 +5535,15 @@ static int patch_stac92hd71bxx(struct hda_codec *codec) ...@@ -5531,10 +5535,15 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)
spec->num_pwrs = 0; spec->num_pwrs = 0;
/* fallthru */ /* fallthru */
default: default:
if (snd_hda_get_bool_hint(codec, "analog_mixer") == 1) {
spec->mixer = stac92hd71bxx_analog_mixer;
memcpy(&spec->private_dimux, &stac92hd71bxx_dmux_amixer, memcpy(&spec->private_dimux, &stac92hd71bxx_dmux_amixer,
sizeof(stac92hd71bxx_dmux_amixer)); sizeof(stac92hd71bxx_dmux_amixer));
if (snd_hda_get_bool_hint(codec, "analog_mixer") == 1) } else {
spec->mixer = stac92hd71bxx_analog_mixer; memcpy(&spec->private_dimux,
&stac92hd71bxx_dmux_nomixer,
sizeof(stac92hd71bxx_dmux_nomixer));
}
spec->init = stac92hd71bxx_core_init; spec->init = stac92hd71bxx_core_init;
codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs; codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs;
spec->num_dmics = stac92hd71bxx_connected_ports(codec, spec->num_dmics = stac92hd71bxx_connected_ports(codec,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册