[ALSA] hda: sigmatel fixes

Modules: HDA Codec driver

* Fix init sequence so manually retaskable jacks don't get added to
the line_out list.
* Update intel mobo config defaults to specify surround outputs
as line outs rather than speakers.

Signed-off-by: Matt Porter <mporter@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

authored by Matt Porter and committed by Jaroslav Kysela 869264c4 1d79716a

+7 -8
+7 -8
sound/pci/hda/patch_sigmatel.c
··· 277 277 }; 278 278 279 279 static unsigned int d945gtp3_pin_configs[10] = { 280 - 0x0221401f, 0x01a19022, 0x01813021, 0x01114010, 280 + 0x0221401f, 0x01a19022, 0x01813021, 0x01014010, 281 281 0x40000100, 0x40000100, 0x40000100, 0x40000100, 282 282 0x02a19120, 0x40000100, 283 283 }; 284 284 285 285 static unsigned int d945gtp5_pin_configs[10] = { 286 - 0x0221401f, 0x01111012, 0x01813024, 0x01114010, 287 - 0x01a19021, 0x01116011, 0x01452130, 0x40000100, 286 + 0x0221401f, 0x01011012, 0x01813024, 0x01014010, 287 + 0x01a19021, 0x01016011, 0x01452130, 0x40000100, 288 288 0x02a19320, 0x40000100, 289 289 }; 290 290 ··· 855 855 856 856 if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg, NULL)) < 0) 857 857 return err; 858 + if (! spec->autocfg.line_outs && ! spec->autocfg.hp_pin) 859 + return 0; /* can't find valid pin config */ 860 + stac92xx_auto_init_multi_out(codec); 861 + stac92xx_auto_init_hp_out(codec); 858 862 if ((err = stac92xx_add_dyn_out_pins(codec, &spec->autocfg)) < 0) 859 863 return err; 860 864 if ((err = stac92xx_auto_fill_dac_nids(codec, &spec->autocfg)) < 0) 861 865 return err; 862 - if (! spec->autocfg.line_outs && ! spec->autocfg.hp_pin) 863 - return 0; /* can't find valid pin config */ 864 866 865 867 if ((err = stac92xx_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 || 866 868 (err = stac92xx_auto_create_hp_ctls(codec, &spec->autocfg)) < 0 || ··· 923 921 struct sigmatel_spec *spec = codec->spec; 924 922 925 923 snd_hda_sequence_write(codec, spec->init); 926 - 927 - stac92xx_auto_init_multi_out(codec); 928 - stac92xx_auto_init_hp_out(codec); 929 924 930 925 return 0; 931 926 }