diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-07-29 10:28:09 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-07-29 10:30:14 -0400 |
commit | 26a2798053519d766ddae1ca1b03c8295fddf1a8 (patch) | |
tree | 6bd6cfcb3996adada3e0a88301e59a70942d5c02 /sound/pci/hda/patch_sigmatel.c | |
parent | 3d21d3f7e7032619f5c5b47d3ee23bbe45de5993 (diff) |
ALSA: hda - Remove static connection in IDT 92HD71bxx
We don't need any more static connection to the port F (which is often
used for docking stations) since its connection is done dynamically via
DAC assignment now.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index f39dc98519a1..abc44dbe0ab9 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -997,19 +997,6 @@ static struct hda_verb stac92hd71bxx_core_init[] = { | |||
997 | {} | 997 | {} |
998 | }; | 998 | }; |
999 | 999 | ||
1000 | #define HD_DISABLE_PORTF 1 | ||
1001 | static struct hda_verb stac92hd71bxx_analog_core_init[] = { | ||
1002 | /* start of config #1 */ | ||
1003 | |||
1004 | /* connect port 0f to audio mixer */ | ||
1005 | { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x2}, | ||
1006 | /* start of config #2 */ | ||
1007 | |||
1008 | /* set master volume and direct control */ | ||
1009 | { 0x28, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff}, | ||
1010 | {} | ||
1011 | }; | ||
1012 | |||
1013 | static struct hda_verb stac92hd71bxx_unmute_core_init[] = { | 1000 | static struct hda_verb stac92hd71bxx_unmute_core_init[] = { |
1014 | /* unmute right and left channels for nodes 0x0f, 0xa, 0x0d */ | 1001 | /* unmute right and left channels for nodes 0x0f, 0xa, 0x0d */ |
1015 | { 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, | 1002 | { 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, |
@@ -5519,7 +5506,7 @@ again: | |||
5519 | spec->mixer = stac92hd71bxx_analog_mixer; | 5506 | spec->mixer = stac92hd71bxx_analog_mixer; |
5520 | 5507 | ||
5521 | /* disable VSW */ | 5508 | /* disable VSW */ |
5522 | spec->init = &stac92hd71bxx_analog_core_init[HD_DISABLE_PORTF]; | 5509 | spec->init = stac92hd71bxx_core_init; |
5523 | unmute_init++; | 5510 | unmute_init++; |
5524 | snd_hda_codec_set_pincfg(codec, 0x0f, 0x40f000f0); | 5511 | snd_hda_codec_set_pincfg(codec, 0x0f, 0x40f000f0); |
5525 | snd_hda_codec_set_pincfg(codec, 0x19, 0x40f000f3); | 5512 | snd_hda_codec_set_pincfg(codec, 0x19, 0x40f000f3); |
@@ -5545,7 +5532,7 @@ again: | |||
5545 | sizeof(stac92hd71bxx_dmux_amixer)); | 5532 | sizeof(stac92hd71bxx_dmux_amixer)); |
5546 | if (snd_hda_get_bool_hint(codec, "analog_mixer") == 1) | 5533 | if (snd_hda_get_bool_hint(codec, "analog_mixer") == 1) |
5547 | spec->mixer = stac92hd71bxx_analog_mixer; | 5534 | spec->mixer = stac92hd71bxx_analog_mixer; |
5548 | spec->init = stac92hd71bxx_analog_core_init; | 5535 | spec->init = stac92hd71bxx_core_init; |
5549 | codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs; | 5536 | codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs; |
5550 | spec->num_dmics = stac92hd71bxx_connected_ports(codec, | 5537 | spec->num_dmics = stac92hd71bxx_connected_ports(codec, |
5551 | stac92hd71bxx_dmic_nids, | 5538 | stac92hd71bxx_dmic_nids, |