diff options
author | Matthew Ranostay <mranostay@embeddedalley.com> | 2008-09-08 11:20:05 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-09-09 03:12:00 -0400 |
commit | 0ffa9807592171ad7421c1ffce7abde04b1622c0 (patch) | |
tree | 805e7a60687cfa11cc76f345c0ee2aaf4e225778 /sound | |
parent | 6010b2da1f11752dd58191423fc9878b0ce420c8 (diff) |
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: Matthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 4da53689618a..1440175e1008 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -235,6 +235,10 @@ static hda_nid_t stac92hd73xx_pwr_nids[8] = { | |||
235 | 0x0f, 0x10, 0x11 | 235 | 0x0f, 0x10, 0x11 |
236 | }; | 236 | }; |
237 | 237 | ||
238 | static hda_nid_t stac92hd73xx_slave_dig_outs[2] = { | ||
239 | 0x26, 0, | ||
240 | }; | ||
241 | |||
238 | static hda_nid_t stac92hd73xx_adc_nids[2] = { | 242 | static hda_nid_t stac92hd73xx_adc_nids[2] = { |
239 | 0x1a, 0x1b | 243 | 0x1a, 0x1b |
240 | }; | 244 | }; |
@@ -284,6 +288,10 @@ static hda_nid_t stac92hd83xxx_pwr_nids[4] = { | |||
284 | 0xa, 0xb, 0xd, 0xe, | 288 | 0xa, 0xb, 0xd, 0xe, |
285 | }; | 289 | }; |
286 | 290 | ||
291 | static hda_nid_t stac92hd83xxx_slave_dig_outs[2] = { | ||
292 | 0x1e, 0, | ||
293 | }; | ||
294 | |||
287 | static unsigned int stac92hd83xxx_pwr_mapping[4] = { | 295 | static unsigned int stac92hd83xxx_pwr_mapping[4] = { |
288 | 0x03, 0x0c, 0x10, 0x40, | 296 | 0x03, 0x0c, 0x10, 0x40, |
289 | }; | 297 | }; |
@@ -317,6 +325,10 @@ static hda_nid_t stac92hd71bxx_dmic_nids[STAC92HD71BXX_NUM_DMICS + 1] = { | |||
317 | 0x18, 0x19, 0 | 325 | 0x18, 0x19, 0 |
318 | }; | 326 | }; |
319 | 327 | ||
328 | static hda_nid_t stac92hd71bxx_slave_dig_outs[2] = { | ||
329 | 0x22, 0 | ||
330 | }; | ||
331 | |||
320 | static hda_nid_t stac925x_adc_nids[1] = { | 332 | static hda_nid_t stac925x_adc_nids[1] = { |
321 | 0x03, | 333 | 0x03, |
322 | }; | 334 | }; |
@@ -418,9 +430,10 @@ static hda_nid_t stac92hd83xxx_pin_nids[14] = { | |||
418 | 0x0f, 0x10, 0x11, 0x12, 0x13, | 430 | 0x0f, 0x10, 0x11, 0x12, 0x13, |
419 | 0x1d, 0x1e, 0x1f, 0x20 | 431 | 0x1d, 0x1e, 0x1f, 0x20 |
420 | }; | 432 | }; |
421 | static hda_nid_t stac92hd71bxx_pin_nids[10] = { | 433 | static hda_nid_t stac92hd71bxx_pin_nids[11] = { |
422 | 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, | 434 | 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, |
423 | 0x0f, 0x14, 0x18, 0x19, 0x1e, | 435 | 0x0f, 0x14, 0x18, 0x19, 0x1e, |
436 | 0x1f, | ||
424 | }; | 437 | }; |
425 | 438 | ||
426 | static hda_nid_t stac927x_pin_nids[14] = { | 439 | static hda_nid_t stac927x_pin_nids[14] = { |
@@ -1492,22 +1505,22 @@ static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = { | |||
1492 | "DFI LanParty", STAC_92HD71BXX_REF), | 1505 | "DFI LanParty", STAC_92HD71BXX_REF), |
1493 | }; | 1506 | }; |
1494 | 1507 | ||
1495 | static unsigned int ref92hd71bxx_pin_configs[10] = { | 1508 | static unsigned int ref92hd71bxx_pin_configs[11] = { |
1496 | 0x02214030, 0x02a19040, 0x01a19020, 0x01014010, | 1509 | 0x02214030, 0x02a19040, 0x01a19020, 0x01014010, |
1497 | 0x0181302e, 0x01114010, 0x01019020, 0x90a000f0, | 1510 | 0x0181302e, 0x01114010, 0x01019020, 0x90a000f0, |
1498 | 0x90a000f0, 0x01452050, | 1511 | 0x90a000f0, 0x01452050, 0x01452050, |
1499 | }; | 1512 | }; |
1500 | 1513 | ||
1501 | static unsigned int dell_m4_1_pin_configs[10] = { | 1514 | static unsigned int dell_m4_1_pin_configs[11] = { |
1502 | 0x0421101f, 0x04a11221, 0x40f000f0, 0x90170110, | 1515 | 0x0421101f, 0x04a11221, 0x40f000f0, 0x90170110, |
1503 | 0x23a1902e, 0x23014250, 0x40f000f0, 0x90a000f0, | 1516 | 0x23a1902e, 0x23014250, 0x40f000f0, 0x90a000f0, |
1504 | 0x40f000f0, 0x4f0000f0, | 1517 | 0x40f000f0, 0x4f0000f0, 0x4f0000f0, |
1505 | }; | 1518 | }; |
1506 | 1519 | ||
1507 | static unsigned int dell_m4_2_pin_configs[10] = { | 1520 | static unsigned int dell_m4_2_pin_configs[11] = { |
1508 | 0x0421101f, 0x04a11221, 0x90a70330, 0x90170110, | 1521 | 0x0421101f, 0x04a11221, 0x90a70330, 0x90170110, |
1509 | 0x23a1902e, 0x23014250, 0x40f000f0, 0x40f000f0, | 1522 | 0x23a1902e, 0x23014250, 0x40f000f0, 0x40f000f0, |
1510 | 0x40f000f0, 0x044413b0, | 1523 | 0x40f000f0, 0x044413b0, 0x044413b0, |
1511 | }; | 1524 | }; |
1512 | 1525 | ||
1513 | static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = { | 1526 | static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = { |
@@ -3984,6 +3997,7 @@ static int patch_stac92hd83xxx(struct hda_codec *codec) | |||
3984 | return -ENOMEM; | 3997 | return -ENOMEM; |
3985 | 3998 | ||
3986 | codec->spec = spec; | 3999 | codec->spec = spec; |
4000 | codec->slave_dig_outs = stac92hd83xxx_slave_dig_outs; | ||
3987 | spec->mono_nid = 0x19; | 4001 | spec->mono_nid = 0x19; |
3988 | spec->digbeep_nid = 0x21; | 4002 | spec->digbeep_nid = 0x21; |
3989 | spec->dmic_nids = stac92hd83xxx_dmic_nids; | 4003 | spec->dmic_nids = stac92hd83xxx_dmic_nids; |
@@ -4134,6 +4148,7 @@ again: | |||
4134 | case 0x111d76b5: | 4148 | case 0x111d76b5: |
4135 | spec->mixer = stac92hd71bxx_mixer; | 4149 | spec->mixer = stac92hd71bxx_mixer; |
4136 | spec->init = stac92hd71bxx_core_init; | 4150 | spec->init = stac92hd71bxx_core_init; |
4151 | codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs; | ||
4137 | break; | 4152 | break; |
4138 | case 0x111d7608: /* 5 Port with Analog Mixer */ | 4153 | case 0x111d7608: /* 5 Port with Analog Mixer */ |
4139 | if ((codec->revision_id & 0xf) == 0 || | 4154 | if ((codec->revision_id & 0xf) == 0 || |
@@ -4166,6 +4181,7 @@ again: | |||
4166 | default: | 4181 | default: |
4167 | spec->mixer = stac92hd71bxx_analog_mixer; | 4182 | spec->mixer = stac92hd71bxx_analog_mixer; |
4168 | spec->init = stac92hd71bxx_analog_core_init; | 4183 | spec->init = stac92hd71bxx_analog_core_init; |
4184 | codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs; | ||
4169 | } | 4185 | } |
4170 | 4186 | ||
4171 | spec->aloopback_mask = 0x20; | 4187 | spec->aloopback_mask = 0x20; |