Commit 0ffa9807 authored by Matthew Ranostay's avatar Matthew Ranostay Committed by Jaroslav Kysela

ALSA: hda: digital slave support for IDT codecs

Added slave_dig_outs entries for several IDT codecs that have multiple
SPDIF outs, and enabled these SPDIF outs in several pin configs.
Signed-off-by: default avatarMatthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 6010b2da
...@@ -235,6 +235,10 @@ static hda_nid_t stac92hd73xx_pwr_nids[8] = { ...@@ -235,6 +235,10 @@ static hda_nid_t stac92hd73xx_pwr_nids[8] = {
0x0f, 0x10, 0x11 0x0f, 0x10, 0x11
}; };
static hda_nid_t stac92hd73xx_slave_dig_outs[2] = {
0x26, 0,
};
static hda_nid_t stac92hd73xx_adc_nids[2] = { static hda_nid_t stac92hd73xx_adc_nids[2] = {
0x1a, 0x1b 0x1a, 0x1b
}; };
...@@ -284,6 +288,10 @@ static hda_nid_t stac92hd83xxx_pwr_nids[4] = { ...@@ -284,6 +288,10 @@ static hda_nid_t stac92hd83xxx_pwr_nids[4] = {
0xa, 0xb, 0xd, 0xe, 0xa, 0xb, 0xd, 0xe,
}; };
static hda_nid_t stac92hd83xxx_slave_dig_outs[2] = {
0x1e, 0,
};
static unsigned int stac92hd83xxx_pwr_mapping[4] = { static unsigned int stac92hd83xxx_pwr_mapping[4] = {
0x03, 0x0c, 0x10, 0x40, 0x03, 0x0c, 0x10, 0x40,
}; };
...@@ -317,6 +325,10 @@ static hda_nid_t stac92hd71bxx_dmic_nids[STAC92HD71BXX_NUM_DMICS + 1] = { ...@@ -317,6 +325,10 @@ static hda_nid_t stac92hd71bxx_dmic_nids[STAC92HD71BXX_NUM_DMICS + 1] = {
0x18, 0x19, 0 0x18, 0x19, 0
}; };
static hda_nid_t stac92hd71bxx_slave_dig_outs[2] = {
0x22, 0
};
static hda_nid_t stac925x_adc_nids[1] = { static hda_nid_t stac925x_adc_nids[1] = {
0x03, 0x03,
}; };
...@@ -418,9 +430,10 @@ static hda_nid_t stac92hd83xxx_pin_nids[14] = { ...@@ -418,9 +430,10 @@ static hda_nid_t stac92hd83xxx_pin_nids[14] = {
0x0f, 0x10, 0x11, 0x12, 0x13, 0x0f, 0x10, 0x11, 0x12, 0x13,
0x1d, 0x1e, 0x1f, 0x20 0x1d, 0x1e, 0x1f, 0x20
}; };
static hda_nid_t stac92hd71bxx_pin_nids[10] = { static hda_nid_t stac92hd71bxx_pin_nids[11] = {
0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
0x0f, 0x14, 0x18, 0x19, 0x1e, 0x0f, 0x14, 0x18, 0x19, 0x1e,
0x1f,
}; };
static hda_nid_t stac927x_pin_nids[14] = { static hda_nid_t stac927x_pin_nids[14] = {
...@@ -1492,22 +1505,22 @@ static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = { ...@@ -1492,22 +1505,22 @@ static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
"DFI LanParty", STAC_92HD71BXX_REF), "DFI LanParty", STAC_92HD71BXX_REF),
}; };
static unsigned int ref92hd71bxx_pin_configs[10] = { static unsigned int ref92hd71bxx_pin_configs[11] = {
0x02214030, 0x02a19040, 0x01a19020, 0x01014010, 0x02214030, 0x02a19040, 0x01a19020, 0x01014010,
0x0181302e, 0x01114010, 0x01019020, 0x90a000f0, 0x0181302e, 0x01114010, 0x01019020, 0x90a000f0,
0x90a000f0, 0x01452050, 0x90a000f0, 0x01452050, 0x01452050,
}; };
static unsigned int dell_m4_1_pin_configs[10] = { static unsigned int dell_m4_1_pin_configs[11] = {
0x0421101f, 0x04a11221, 0x40f000f0, 0x90170110, 0x0421101f, 0x04a11221, 0x40f000f0, 0x90170110,
0x23a1902e, 0x23014250, 0x40f000f0, 0x90a000f0, 0x23a1902e, 0x23014250, 0x40f000f0, 0x90a000f0,
0x40f000f0, 0x4f0000f0, 0x40f000f0, 0x4f0000f0, 0x4f0000f0,
}; };
static unsigned int dell_m4_2_pin_configs[10] = { static unsigned int dell_m4_2_pin_configs[11] = {
0x0421101f, 0x04a11221, 0x90a70330, 0x90170110, 0x0421101f, 0x04a11221, 0x90a70330, 0x90170110,
0x23a1902e, 0x23014250, 0x40f000f0, 0x40f000f0, 0x23a1902e, 0x23014250, 0x40f000f0, 0x40f000f0,
0x40f000f0, 0x044413b0, 0x40f000f0, 0x044413b0, 0x044413b0,
}; };
static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = { static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = {
...@@ -3984,6 +3997,7 @@ static int patch_stac92hd83xxx(struct hda_codec *codec) ...@@ -3984,6 +3997,7 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
return -ENOMEM; return -ENOMEM;
codec->spec = spec; codec->spec = spec;
codec->slave_dig_outs = stac92hd83xxx_slave_dig_outs;
spec->mono_nid = 0x19; spec->mono_nid = 0x19;
spec->digbeep_nid = 0x21; spec->digbeep_nid = 0x21;
spec->dmic_nids = stac92hd83xxx_dmic_nids; spec->dmic_nids = stac92hd83xxx_dmic_nids;
...@@ -4134,6 +4148,7 @@ again: ...@@ -4134,6 +4148,7 @@ again:
case 0x111d76b5: case 0x111d76b5:
spec->mixer = stac92hd71bxx_mixer; spec->mixer = stac92hd71bxx_mixer;
spec->init = stac92hd71bxx_core_init; spec->init = stac92hd71bxx_core_init;
codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs;
break; break;
case 0x111d7608: /* 5 Port with Analog Mixer */ case 0x111d7608: /* 5 Port with Analog Mixer */
if ((codec->revision_id & 0xf) == 0 || if ((codec->revision_id & 0xf) == 0 ||
...@@ -4166,6 +4181,7 @@ again: ...@@ -4166,6 +4181,7 @@ again:
default: default:
spec->mixer = stac92hd71bxx_analog_mixer; spec->mixer = stac92hd71bxx_analog_mixer;
spec->init = stac92hd71bxx_analog_core_init; spec->init = stac92hd71bxx_analog_core_init;
codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs;
} }
spec->aloopback_mask = 0x20; spec->aloopback_mask = 0x20;
......
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