Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 111031
b: refs/heads/master
c: 6a14f58
h: refs/heads/master
i:
  111029: b591b3e
  111027: 7521b56
  111023: b5cca7d
v: v3
  • Loading branch information
Matthew Ranostay authored and Jaroslav Kysela committed Sep 23, 2008
1 parent 9d99627 commit 943a9b9
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9932fbb0b37d13201655b4de2b9acda2f415d83b
refs/heads/master: 6a14f58518dd18d315eaa6e4ca38bc6b051927af
21 changes: 19 additions & 2 deletions trunk/sound/pci/hda/patch_sigmatel.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ enum {
STAC_92HD71BXX_REF,
STAC_DELL_M4_1,
STAC_DELL_M4_2,
STAC_HP_M4,
STAC_92HD71BXX_MODELS
};

Expand Down Expand Up @@ -1527,12 +1528,14 @@ static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = {
[STAC_92HD71BXX_REF] = ref92hd71bxx_pin_configs,
[STAC_DELL_M4_1] = dell_m4_1_pin_configs,
[STAC_DELL_M4_2] = dell_m4_2_pin_configs,
[STAC_HP_M4] = NULL,
};

static const char *stac92hd71bxx_models[STAC_92HD71BXX_MODELS] = {
[STAC_92HD71BXX_REF] = "ref",
[STAC_DELL_M4_1] = "dell-m4-1",
[STAC_DELL_M4_2] = "dell-m4-2",
[STAC_HP_M4] = "hp-m4",
};

static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = {
Expand Down Expand Up @@ -4204,10 +4207,24 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)

spec->num_muxes = ARRAY_SIZE(stac92hd71bxx_mux_nids);
spec->num_adcs = ARRAY_SIZE(stac92hd71bxx_adc_nids);
spec->num_dmics = STAC92HD71BXX_NUM_DMICS;
spec->num_smuxes = ARRAY_SIZE(stac92hd71bxx_smux_nids);
spec->num_dmuxes = ARRAY_SIZE(stac92hd71bxx_dmux_nids);

switch (spec->board_config) {
case STAC_HP_M4:
spec->num_dmics = 0;
spec->num_smuxes = 1;
spec->num_dmuxes = 0;

/* enable internal microphone */
snd_hda_codec_write_cache(codec, 0x0e, 0,
AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80);
break;
default:
spec->num_dmics = STAC92HD71BXX_NUM_DMICS;
spec->num_smuxes = ARRAY_SIZE(stac92hd71bxx_smux_nids);
spec->num_dmuxes = ARRAY_SIZE(stac92hd71bxx_dmux_nids);
};

spec->multiout.num_dacs = 1;
spec->multiout.hp_nid = 0x11;
spec->multiout.dac_nids = stac92hd71bxx_dac_nids;
Expand Down

0 comments on commit 943a9b9

Please sign in to comment.