Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 170289
b: refs/heads/master
c: bc7e7e5
h: refs/heads/master
i:
  170287: 9fc3092
v: v3
  • Loading branch information
Lydia Wang authored and Takashi Iwai committed Oct 11, 2009
1 parent fc6be32 commit 803a0a0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 15 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: 6369bcfccb57da28ad3e09b25fecd841a415ae95
refs/heads/master: bc7e7e5ce05047e16633a94d36fa144af1d2b4c7
20 changes: 6 additions & 14 deletions trunk/sound/pci/hda/patch_via.c
Original file line number Diff line number Diff line change
Expand Up @@ -3068,6 +3068,8 @@ static struct hda_verb vt1708S_volume_init_verbs[] = {
{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
/* Enable Mic Boost Volume backdoor */
{0x1, 0xf98, 0x1},
/* don't bybass mixer */
{0x1, 0xf88, 0xc0},
{ }
};

Expand Down Expand Up @@ -3527,6 +3529,10 @@ static struct hda_verb vt1702_volume_init_verbs[] = {
/* PW6 PW7 Output enable */
{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
{0x1C, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
/* mixer enable */
{0x1, 0xF88, 0x3},
/* GPIO 0~2 */
{0x1, 0xF82, 0x3F},
{ }
};

Expand Down Expand Up @@ -3768,8 +3774,6 @@ static int patch_vt1702(struct hda_codec *codec)
{
struct via_spec *spec;
int err;
unsigned int response;
unsigned char control;

/* create a codec specific record */
spec = kzalloc(sizeof(*spec), GFP_KERNEL);
Expand Down Expand Up @@ -3814,18 +3818,6 @@ static int patch_vt1702(struct hda_codec *codec)
spec->loopback.amplist = vt1702_loopbacks;
#endif

/* Open backdoor */
response = snd_hda_codec_read(codec, codec->afg, 0, 0xF8C, 0);
control = (unsigned char)(response & 0xff);
control |= 0x3;
snd_hda_codec_write(codec, codec->afg, 0, 0xF88, control);

/* Enable GPIO 0&1 for volume&mute control */
/* Enable GPIO 2 for DMIC-DATA */
response = snd_hda_codec_read(codec, codec->afg, 0, 0xF84, 0);
control = (unsigned char)((response >> 16) & 0x3f);
snd_hda_codec_write(codec, codec->afg, 0, 0xF82, control);

return 0;
}

Expand Down

0 comments on commit 803a0a0

Please sign in to comment.