diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 50 |
1 files changed, 36 insertions, 14 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index c461baa83c2a..1e7b6c111b25 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -322,8 +322,8 @@ static hda_nid_t stac92hd71bxx_mux_nids[2] = { | |||
322 | 0x1a, 0x1b | 322 | 0x1a, 0x1b |
323 | }; | 323 | }; |
324 | 324 | ||
325 | static hda_nid_t stac92hd71bxx_dmux_nids[1] = { | 325 | static hda_nid_t stac92hd71bxx_dmux_nids[2] = { |
326 | 0x1c, | 326 | 0x1c, 0x1d, |
327 | }; | 327 | }; |
328 | 328 | ||
329 | static hda_nid_t stac92hd71bxx_smux_nids[2] = { | 329 | static hda_nid_t stac92hd71bxx_smux_nids[2] = { |
@@ -861,20 +861,18 @@ static struct hda_verb stac92hd71bxx_core_init[] = { | |||
861 | { 0x28, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff}, | 861 | { 0x28, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff}, |
862 | /* connect headphone jack to dac1 */ | 862 | /* connect headphone jack to dac1 */ |
863 | { 0x0a, AC_VERB_SET_CONNECT_SEL, 0x01}, | 863 | { 0x0a, AC_VERB_SET_CONNECT_SEL, 0x01}, |
864 | { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, /* Speaker */ | ||
865 | /* unmute right and left channels for nodes 0x0a, 0xd, 0x0f */ | 864 | /* unmute right and left channels for nodes 0x0a, 0xd, 0x0f */ |
866 | { 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, | 865 | { 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, |
867 | { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, | 866 | { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, |
868 | { 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, | 867 | { 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, |
869 | }; | 868 | }; |
870 | 869 | ||
871 | #define HD_DISABLE_PORTF 3 | 870 | #define HD_DISABLE_PORTF 2 |
872 | static struct hda_verb stac92hd71bxx_analog_core_init[] = { | 871 | static struct hda_verb stac92hd71bxx_analog_core_init[] = { |
873 | /* start of config #1 */ | 872 | /* start of config #1 */ |
874 | 873 | ||
875 | /* connect port 0f to audio mixer */ | 874 | /* connect port 0f to audio mixer */ |
876 | { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x2}, | 875 | { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x2}, |
877 | { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, /* Speaker */ | ||
878 | /* unmute right and left channels for node 0x0f */ | 876 | /* unmute right and left channels for node 0x0f */ |
879 | { 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, | 877 | { 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, |
880 | /* start of config #2 */ | 878 | /* start of config #2 */ |
@@ -883,10 +881,6 @@ static struct hda_verb stac92hd71bxx_analog_core_init[] = { | |||
883 | { 0x28, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff}, | 881 | { 0x28, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff}, |
884 | /* connect headphone jack to dac1 */ | 882 | /* connect headphone jack to dac1 */ |
885 | { 0x0a, AC_VERB_SET_CONNECT_SEL, 0x01}, | 883 | { 0x0a, AC_VERB_SET_CONNECT_SEL, 0x01}, |
886 | /* connect port 0d to audio mixer */ | ||
887 | { 0x0d, AC_VERB_SET_CONNECT_SEL, 0x2}, | ||
888 | /* unmute dac0 input in audio mixer */ | ||
889 | { 0x17, AC_VERB_SET_AMP_GAIN_MUTE, 0x701f}, | ||
890 | /* unmute right and left channels for nodes 0x0a, 0xd */ | 884 | /* unmute right and left channels for nodes 0x0a, 0xd */ |
891 | { 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, | 885 | { 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, |
892 | { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, | 886 | { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, |
@@ -1107,6 +1101,7 @@ static struct snd_kcontrol_new stac92hd83xxx_mixer[] = { | |||
1107 | 1101 | ||
1108 | static struct snd_kcontrol_new stac92hd71bxx_analog_mixer[] = { | 1102 | static struct snd_kcontrol_new stac92hd71bxx_analog_mixer[] = { |
1109 | STAC_INPUT_SOURCE(2), | 1103 | STAC_INPUT_SOURCE(2), |
1104 | STAC_ANALOG_LOOPBACK(0xFA0, 0x7A0, 2), | ||
1110 | 1105 | ||
1111 | HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x1c, 0x0, HDA_OUTPUT), | 1106 | HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x1c, 0x0, HDA_OUTPUT), |
1112 | HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1c, 0x0, HDA_OUTPUT), | 1107 | HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1c, 0x0, HDA_OUTPUT), |
@@ -1119,8 +1114,17 @@ static struct snd_kcontrol_new stac92hd71bxx_analog_mixer[] = { | |||
1119 | HDA_CODEC_MUTE("PC Beep Switch", 0x17, 0x2, HDA_INPUT), | 1114 | HDA_CODEC_MUTE("PC Beep Switch", 0x17, 0x2, HDA_INPUT), |
1120 | */ | 1115 | */ |
1121 | 1116 | ||
1122 | HDA_CODEC_MUTE("Analog Loopback 1", 0x17, 0x3, HDA_INPUT), | 1117 | HDA_CODEC_MUTE("Import0 Mux Capture Switch", 0x17, 0x3, HDA_INPUT), |
1123 | HDA_CODEC_MUTE("Analog Loopback 2", 0x17, 0x4, HDA_INPUT), | 1118 | HDA_CODEC_VOLUME("Import0 Mux Capture Volume", 0x17, 0x3, HDA_INPUT), |
1119 | |||
1120 | HDA_CODEC_MUTE("Import1 Mux Capture Switch", 0x17, 0x3, HDA_INPUT), | ||
1121 | HDA_CODEC_VOLUME("Import1 Mux Capture Volume", 0x17, 0x3, HDA_INPUT), | ||
1122 | |||
1123 | HDA_CODEC_MUTE("DAC0 Capture Switch", 0x17, 0x3, HDA_INPUT), | ||
1124 | HDA_CODEC_VOLUME("DAC0 Capture Volume", 0x17, 0x3, HDA_INPUT), | ||
1125 | |||
1126 | HDA_CODEC_MUTE("DAC1 Capture Switch", 0x17, 0x4, HDA_INPUT), | ||
1127 | HDA_CODEC_VOLUME("DAC1 Capture Volume", 0x17, 0x4, HDA_INPUT), | ||
1124 | { } /* end */ | 1128 | { } /* end */ |
1125 | }; | 1129 | }; |
1126 | 1130 | ||
@@ -1649,7 +1653,7 @@ static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = { | |||
1649 | 1653 | ||
1650 | static unsigned int ref92hd71bxx_pin_configs[11] = { | 1654 | static unsigned int ref92hd71bxx_pin_configs[11] = { |
1651 | 0x02214030, 0x02a19040, 0x01a19020, 0x01014010, | 1655 | 0x02214030, 0x02a19040, 0x01a19020, 0x01014010, |
1652 | 0x0181302e, 0x01114010, 0x01019020, 0x90a000f0, | 1656 | 0x0181302e, 0x01014010, 0x01019020, 0x90a000f0, |
1653 | 0x90a000f0, 0x01452050, 0x01452050, | 1657 | 0x90a000f0, 0x01452050, 0x01452050, |
1654 | }; | 1658 | }; |
1655 | 1659 | ||
@@ -3000,7 +3004,7 @@ static int stac92xx_auto_create_mono_output_ctls(struct hda_codec *codec) | |||
3000 | 3004 | ||
3001 | /* labels for amp mux outputs */ | 3005 | /* labels for amp mux outputs */ |
3002 | static const char *stac92xx_amp_labels[3] = { | 3006 | static const char *stac92xx_amp_labels[3] = { |
3003 | "Front Microphone", "Microphone", "Line In" | 3007 | "Front Microphone", "Microphone", "Line In", |
3004 | }; | 3008 | }; |
3005 | 3009 | ||
3006 | /* create amp out controls mux on capable codecs */ | 3010 | /* create amp out controls mux on capable codecs */ |
@@ -4327,6 +4331,16 @@ static struct hda_codec_ops stac92hd71bxx_patch_ops = { | |||
4327 | #endif | 4331 | #endif |
4328 | }; | 4332 | }; |
4329 | 4333 | ||
4334 | static struct hda_input_mux stac92hd71bxx_dmux = { | ||
4335 | .num_items = 4, | ||
4336 | .items = { | ||
4337 | { "Analog Inputs", 0x00 }, | ||
4338 | { "Mixer", 0x01 }, | ||
4339 | { "Digital Mic 1", 0x02 }, | ||
4340 | { "Digital Mic 2", 0x03 }, | ||
4341 | } | ||
4342 | }; | ||
4343 | |||
4330 | static int patch_stac92hd71bxx(struct hda_codec *codec) | 4344 | static int patch_stac92hd71bxx(struct hda_codec *codec) |
4331 | { | 4345 | { |
4332 | struct sigmatel_spec *spec; | 4346 | struct sigmatel_spec *spec; |
@@ -4341,6 +4355,8 @@ static int patch_stac92hd71bxx(struct hda_codec *codec) | |||
4341 | spec->num_pins = ARRAY_SIZE(stac92hd71bxx_pin_nids); | 4355 | spec->num_pins = ARRAY_SIZE(stac92hd71bxx_pin_nids); |
4342 | spec->num_pwrs = ARRAY_SIZE(stac92hd71bxx_pwr_nids); | 4356 | spec->num_pwrs = ARRAY_SIZE(stac92hd71bxx_pwr_nids); |
4343 | spec->pin_nids = stac92hd71bxx_pin_nids; | 4357 | spec->pin_nids = stac92hd71bxx_pin_nids; |
4358 | memcpy(&spec->private_dimux, &stac92hd71bxx_dmux, | ||
4359 | sizeof(stac92hd71bxx_dmux)); | ||
4344 | spec->board_config = snd_hda_check_board_config(codec, | 4360 | spec->board_config = snd_hda_check_board_config(codec, |
4345 | STAC_92HD71BXX_MODELS, | 4361 | STAC_92HD71BXX_MODELS, |
4346 | stac92hd71bxx_models, | 4362 | stac92hd71bxx_models, |
@@ -4392,6 +4408,7 @@ again: | |||
4392 | /* no output amps */ | 4408 | /* no output amps */ |
4393 | spec->num_pwrs = 0; | 4409 | spec->num_pwrs = 0; |
4394 | spec->mixer = stac92hd71bxx_analog_mixer; | 4410 | spec->mixer = stac92hd71bxx_analog_mixer; |
4411 | spec->dinput_mux = &spec->private_dimux; | ||
4395 | 4412 | ||
4396 | /* disable VSW */ | 4413 | /* disable VSW */ |
4397 | spec->init = &stac92hd71bxx_analog_core_init[HD_DISABLE_PORTF]; | 4414 | spec->init = &stac92hd71bxx_analog_core_init[HD_DISABLE_PORTF]; |
@@ -4409,12 +4426,13 @@ again: | |||
4409 | spec->num_pwrs = 0; | 4426 | spec->num_pwrs = 0; |
4410 | /* fallthru */ | 4427 | /* fallthru */ |
4411 | default: | 4428 | default: |
4429 | spec->dinput_mux = &spec->private_dimux; | ||
4412 | spec->mixer = stac92hd71bxx_analog_mixer; | 4430 | spec->mixer = stac92hd71bxx_analog_mixer; |
4413 | spec->init = stac92hd71bxx_analog_core_init; | 4431 | spec->init = stac92hd71bxx_analog_core_init; |
4414 | codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs; | 4432 | codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs; |
4415 | } | 4433 | } |
4416 | 4434 | ||
4417 | spec->aloopback_mask = 0x20; | 4435 | spec->aloopback_mask = 0x50; |
4418 | spec->aloopback_shift = 0; | 4436 | spec->aloopback_shift = 0; |
4419 | 4437 | ||
4420 | if (spec->board_config > STAC_92HD71BXX_REF) { | 4438 | if (spec->board_config > STAC_92HD71BXX_REF) { |
@@ -4456,6 +4474,10 @@ again: | |||
4456 | spec->multiout.num_dacs = 1; | 4474 | spec->multiout.num_dacs = 1; |
4457 | spec->multiout.hp_nid = 0x11; | 4475 | spec->multiout.hp_nid = 0x11; |
4458 | spec->multiout.dac_nids = stac92hd71bxx_dac_nids; | 4476 | spec->multiout.dac_nids = stac92hd71bxx_dac_nids; |
4477 | if (spec->dinput_mux) | ||
4478 | spec->private_dimux.num_items += | ||
4479 | spec->num_dmics - | ||
4480 | (ARRAY_SIZE(stac92hd71bxx_dmic_nids) - 1); | ||
4459 | 4481 | ||
4460 | err = stac92xx_parse_auto_config(codec, 0x21, 0x23); | 4482 | err = stac92xx_parse_auto_config(codec, 0x21, 0x23); |
4461 | if (!err) { | 4483 | if (!err) { |