summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-07-29 16:28:09 +0200
committerTakashi Iwai <tiwai@suse.de>2009-07-29 16:30:14 +0200
commit26a2798053519d766ddae1ca1b03c8295fddf1a8 (patch)
tree6bd6cfcb3996adada3e0a88301e59a70942d5c02 /sound/pci
parent3d21d3f7e7032619f5c5b47d3ee23bbe45de5993 (diff)
downloadlinux-stable-26a2798053519d766ddae1ca1b03c8295fddf1a8.tar.gz
linux-stable-26a2798053519d766ddae1ca1b03c8295fddf1a8.tar.bz2
linux-stable-26a2798053519d766ddae1ca1b03c8295fddf1a8.zip
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')
-rw-r--r--sound/pci/hda/patch_sigmatel.c17
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[] = {
{}
};
-#define HD_DISABLE_PORTF 1
-static struct hda_verb stac92hd71bxx_analog_core_init[] = {
- /* start of config #1 */
-
- /* connect port 0f to audio mixer */
- { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x2},
- /* start of config #2 */
-
- /* set master volume and direct control */
- { 0x28, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
- {}
-};
-
static struct hda_verb stac92hd71bxx_unmute_core_init[] = {
/* unmute right and left channels for nodes 0x0f, 0xa, 0x0d */
{ 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
@@ -5519,7 +5506,7 @@ again:
spec->mixer = stac92hd71bxx_analog_mixer;
/* disable VSW */
- spec->init = &stac92hd71bxx_analog_core_init[HD_DISABLE_PORTF];
+ spec->init = stac92hd71bxx_core_init;
unmute_init++;
snd_hda_codec_set_pincfg(codec, 0x0f, 0x40f000f0);
snd_hda_codec_set_pincfg(codec, 0x19, 0x40f000f3);
@@ -5545,7 +5532,7 @@ again:
sizeof(stac92hd71bxx_dmux_amixer));
if (snd_hda_get_bool_hint(codec, "analog_mixer") == 1)
spec->mixer = stac92hd71bxx_analog_mixer;
- spec->init = stac92hd71bxx_analog_core_init;
+ spec->init = stac92hd71bxx_core_init;
codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs;
spec->num_dmics = stac92hd71bxx_connected_ports(codec,
stac92hd71bxx_dmic_nids,