Merge branch 'topic/hda' into for-linus
This commit is contained in:
commit
8ac65de647
|
@ -8764,6 +8764,10 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
|
|||
{}
|
||||
};
|
||||
|
||||
static hda_nid_t alc883_slave_dig_outs[] = {
|
||||
ALC1200_DIGOUT_NID, 0,
|
||||
};
|
||||
|
||||
static hda_nid_t alc1200_slave_dig_outs[] = {
|
||||
ALC883_DIGOUT_NID, 0,
|
||||
};
|
||||
|
@ -8809,6 +8813,7 @@ static struct alc_config_preset alc883_presets[] = {
|
|||
.dac_nids = alc883_dac_nids,
|
||||
.dig_out_nid = ALC883_DIGOUT_NID,
|
||||
.dig_in_nid = ALC883_DIGIN_NID,
|
||||
.slave_dig_outs = alc883_slave_dig_outs,
|
||||
.num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_intel_modes),
|
||||
.channel_mode = alc883_3ST_6ch_intel_modes,
|
||||
.need_dac_fix = 1,
|
||||
|
|
|
@ -4895,6 +4895,7 @@ again:
|
|||
switch (codec->vendor_id) {
|
||||
case 0x111d7604:
|
||||
case 0x111d7605:
|
||||
case 0x111d76d5:
|
||||
if (spec->board_config == STAC_92HD83XXX_PWR_REF)
|
||||
break;
|
||||
spec->num_pwrs = 0;
|
||||
|
@ -5707,6 +5708,7 @@ static struct hda_codec_preset snd_hda_preset_sigmatel[] = {
|
|||
{ .id = 0x111d7603, .name = "92HD75B3X5", .patch = patch_stac92hd71bxx},
|
||||
{ .id = 0x111d7604, .name = "92HD83C1X5", .patch = patch_stac92hd83xxx},
|
||||
{ .id = 0x111d7605, .name = "92HD81B1X5", .patch = patch_stac92hd83xxx},
|
||||
{ .id = 0x111d76d5, .name = "92HD81B1C5", .patch = patch_stac92hd83xxx},
|
||||
{ .id = 0x111d7608, .name = "92HD75B2X5", .patch = patch_stac92hd71bxx},
|
||||
{ .id = 0x111d7674, .name = "92HD73D1X5", .patch = patch_stac92hd73xx },
|
||||
{ .id = 0x111d7675, .name = "92HD73C1X5", .patch = patch_stac92hd73xx },
|
||||
|
|
Loading…
Reference in a new issue