提交 005b1076 编写于 作者: D David Heidelberger 提交者: Takashi Iwai

ALSA: hda - targa and targa-2ch fix

Simplify ALC882_TARGA and return gpio3 to ALC883_TARGA_DIG and
ALC883_TARGA_2ch_DIG, which I accidentally removed in commit id
64a8be74Signed-off-by: NDavid Heidelberger <d.okias@gmail.com>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 369693dc
...@@ -6919,9 +6919,6 @@ static struct hda_verb alc882_targa_verbs[] = { ...@@ -6919,9 +6919,6 @@ static struct hda_verb alc882_targa_verbs[] = {
{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */ {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN}, {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
{0x01, AC_VERB_SET_GPIO_MASK, 0x03},
{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x03},
{0x01, AC_VERB_SET_GPIO_DATA, 0x03},
{ } /* end */ { } /* end */
}; };
...@@ -7241,7 +7238,8 @@ static struct alc_config_preset alc882_presets[] = { ...@@ -7241,7 +7238,8 @@ static struct alc_config_preset alc882_presets[] = {
}, },
[ALC882_TARGA] = { [ALC882_TARGA] = {
.mixers = { alc882_targa_mixer, alc882_chmode_mixer }, .mixers = { alc882_targa_mixer, alc882_chmode_mixer },
.init_verbs = { alc882_init_verbs, alc882_targa_verbs}, .init_verbs = { alc882_init_verbs, alc880_gpio3_init_verbs,
alc882_targa_verbs},
.num_dacs = ARRAY_SIZE(alc882_dac_nids), .num_dacs = ARRAY_SIZE(alc882_dac_nids),
.dac_nids = alc882_dac_nids, .dac_nids = alc882_dac_nids,
.dig_out_nid = ALC882_DIGOUT_NID, .dig_out_nid = ALC882_DIGOUT_NID,
...@@ -9238,7 +9236,8 @@ static struct alc_config_preset alc883_presets[] = { ...@@ -9238,7 +9236,8 @@ static struct alc_config_preset alc883_presets[] = {
}, },
[ALC883_TARGA_DIG] = { [ALC883_TARGA_DIG] = {
.mixers = { alc883_targa_mixer, alc883_chmode_mixer }, .mixers = { alc883_targa_mixer, alc883_chmode_mixer },
.init_verbs = { alc883_init_verbs, alc883_targa_verbs}, .init_verbs = { alc883_init_verbs, alc880_gpio3_init_verbs,
alc883_targa_verbs},
.num_dacs = ARRAY_SIZE(alc883_dac_nids), .num_dacs = ARRAY_SIZE(alc883_dac_nids),
.dac_nids = alc883_dac_nids, .dac_nids = alc883_dac_nids,
.dig_out_nid = ALC883_DIGOUT_NID, .dig_out_nid = ALC883_DIGOUT_NID,
...@@ -9251,7 +9250,8 @@ static struct alc_config_preset alc883_presets[] = { ...@@ -9251,7 +9250,8 @@ static struct alc_config_preset alc883_presets[] = {
}, },
[ALC883_TARGA_2ch_DIG] = { [ALC883_TARGA_2ch_DIG] = {
.mixers = { alc883_targa_2ch_mixer}, .mixers = { alc883_targa_2ch_mixer},
.init_verbs = { alc883_init_verbs, alc883_targa_verbs}, .init_verbs = { alc883_init_verbs, alc880_gpio3_init_verbs,
alc883_targa_verbs},
.num_dacs = ARRAY_SIZE(alc883_dac_nids), .num_dacs = ARRAY_SIZE(alc883_dac_nids),
.dac_nids = alc883_dac_nids, .dac_nids = alc883_dac_nids,
.adc_nids = alc883_adc_nids_alt, .adc_nids = alc883_adc_nids_alt,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册