Skip to content

L
linux-davinci
Commit 26aaa424 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

Merge branch 'fix/hda' into for-next

parents 305f9e3b 69b5655a
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
sound/pci/hda/patch_sigmatel.c
View file @ 26aaa424
...@@ -864,10 +864,6 @@ static struct hda_verb stac92hd73xx_core_init[] = { ...@@ -864,10 +864,6 @@ static struct hda_verb stac92hd73xx_core_init[] = {
}; };
static struct hda_verb stac92hd83xxx_core_init[] = { static struct hda_verb stac92hd83xxx_core_init[] = {
{ 0xa, AC_VERB_SET_CONNECT_SEL, 0x1},
{ 0xb, AC_VERB_SET_CONNECT_SEL, 0x1},
{ 0xd, AC_VERB_SET_CONNECT_SEL, 0x0},
/* power state controls amps */ /* power state controls amps */
{ 0x01, AC_VERB_SET_EAPD, 1 << 2}, { 0x01, AC_VERB_SET_EAPD, 1 << 2},
{} {}
...@@ -1590,8 +1586,8 @@ static unsigned int ref92hd83xxx_pin_configs[10] = { ...@@ -1590,8 +1586,8 @@ static unsigned int ref92hd83xxx_pin_configs[10] = {
}; };
static unsigned int dell_s14_pin_configs[10] = { static unsigned int dell_s14_pin_configs[10] = {
0x02214030, 0x02211010, 0x02a19020, 0x01014050, 0x0221403f, 0x0221101f, 0x02a19020, 0x90170110,
0x40f000f0, 0x01819040, 0x40f000f0, 0x90a60160, 0x40f000f0, 0x40f000f0, 0x40f000f0, 0x90a60160,
0x40f000f0, 0x40f000f0, 0x40f000f0, 0x40f000f0,
}; };
...@@ -5076,7 +5072,6 @@ static int patch_stac92hd83xxx(struct hda_codec *codec) ...@@ -5076,7 +5072,6 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
codec->spec = spec; codec->spec = spec;
codec->slave_dig_outs = stac92hd83xxx_slave_dig_outs; codec->slave_dig_outs = stac92hd83xxx_slave_dig_outs;
spec->mono_nid = 0x19;
spec->digbeep_nid = 0x21; spec->digbeep_nid = 0x21;
spec->mux_nids = stac92hd83xxx_mux_nids; spec->mux_nids = stac92hd83xxx_mux_nids;
spec->num_muxes = ARRAY_SIZE(stac92hd83xxx_mux_nids); spec->num_muxes = ARRAY_SIZE(stac92hd83xxx_mux_nids);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment