Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 133121
b: refs/heads/master
c: 307282c
h: refs/heads/master
i:
  133119: d1f7ac0
v: v3
  • Loading branch information
Takashi Iwai committed Mar 12, 2009
1 parent 02b7040 commit 40fc442
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 4 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: 9421f9543b3a0a870499f64498406003de8214b4
refs/heads/master: 307282c8990c5658604b9fda8a64a9a07079b850
3 changes: 2 additions & 1 deletion trunk/Documentation/sound/alsa/HD-Audio-Models.txt
Original file line number Diff line number Diff line change
Expand Up @@ -368,4 +368,5 @@ STAC92HD83*

STAC9872
========
N/A
vaio VAIO laptop without SPDIF
auto BIOS setup (default)
33 changes: 31 additions & 2 deletions trunk/sound/pci/hda/patch_sigmatel.c
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,12 @@ enum {
STAC_927X_MODELS
};

enum {
STAC_9872_AUTO,
STAC_9872_VAIO,
STAC_9872_MODELS
};

struct sigmatel_event {
hda_nid_t nid;
unsigned char type;
Expand Down Expand Up @@ -5588,6 +5594,25 @@ static hda_nid_t stac9872_mux_nids[] = {
0x15
};

static unsigned int stac9872_vaio_pin_configs[9] = {
0x03211020, 0x411111f0, 0x411111f0, 0x03a15030,
0x411111f0, 0x90170110, 0x411111f0, 0x411111f0,
0x90a7013e
};

static const char *stac9872_models[STAC_9872_MODELS] = {
[STAC_9872_AUTO] = "auto",
[STAC_9872_VAIO] = "vaio",
};

static unsigned int *stac9872_brd_tbl[STAC_9872_MODELS] = {
[STAC_9872_VAIO] = stac9872_vaio_pin_configs,
};

static struct snd_pci_quirk stac9872_cfg_tbl[] = {
{} /* terminator */
};

static int patch_stac9872(struct hda_codec *codec)
{
struct sigmatel_spec *spec;
Expand All @@ -5598,11 +5623,15 @@ static int patch_stac9872(struct hda_codec *codec)
return -ENOMEM;
codec->spec = spec;

#if 0 /* no model right now */
spec->board_config = snd_hda_check_board_config(codec, STAC_9872_MODELS,
stac9872_models,
stac9872_cfg_tbl);
#endif
if (spec->board_config < 0)
snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC9872, "
"using BIOS defaults\n");
else
stac92xx_set_config_regs(codec,
stac9872_brd_tbl[spec->board_config]);

spec->num_pins = ARRAY_SIZE(stac9872_pin_nids);
spec->pin_nids = stac9872_pin_nids;
Expand Down

0 comments on commit 40fc442

Please sign in to comment.