TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: Fix workaround for AD1988A rev2 codec

Browse Source 
Fix the workaround for AD1988A rev2 codec not to apply to AD1988B codec
chips.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
This commit is contained in:
Takashi Iwai
2006-09-05 21:38:52 +02:00
committed by Adrian Bunk
parent f29766600c
commit f05a9cc417
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sound/pci/hda/patch_analog.c
+9 -6
View File
@@ -978,6 +978,9 @@ enum {
/* reivision id to check workarounds */
#define AD1988A_REV2 0x100200
#define is_rev2(codec) \
((codec)->vendor_id == 0x11d41988 && \
(codec)->revision_id == AD1988A_REV2)
/*
* mixers
@@ -1667,7 +1670,7 @@ static inline hda_nid_t ad1988_idx_to_dac(struct hda_codec *codec, int idx)
/* A B C D E F G H */
0x04, 0x05, 0x0a, 0x04, 0x06, 0x05, 0x0a, 0x06
};
if (codec->revision_id == AD1988A_REV2)
if (is_rev2(codec))
return idx_to_dac_rev2[idx];
else
return idx_to_dac[idx];
@@ -2039,7 +2042,7 @@ static int patch_ad1988(struct hda_codec *codec)
init_MUTEX(&spec->amp_mutex);
codec->spec = spec;
if (codec->revision_id == AD1988A_REV2)
if (is_rev2(codec))
snd_printk(KERN_INFO "patch_analog: AD1988A rev.2 is detected, enable workarounds\n");
board_config = snd_hda_check_board_config(codec, ad1988_cfg_tbl);
@@ -2065,13 +2068,13 @@ static int patch_ad1988(struct hda_codec *codec)
case AD1988_6STACK_DIG:
spec->multiout.max_channels = 8;
spec->multiout.num_dacs = 4;
if (codec->revision_id == AD1988A_REV2)
if (is_rev2(codec))
spec->multiout.dac_nids = ad1988_6stack_dac_nids_rev2;
else
spec->multiout.dac_nids = ad1988_6stack_dac_nids;
spec->input_mux = &ad1988_6stack_capture_source;
spec->num_mixers = 2;
if (codec->revision_id == AD1988A_REV2)
if (is_rev2(codec))
spec->mixers[0] = ad1988_6stack_mixers1_rev2;
else
spec->mixers[0] = ad1988_6stack_mixers1;
@@ -2087,7 +2090,7 @@ static int patch_ad1988(struct hda_codec *codec)
case AD1988_3STACK_DIG:
spec->multiout.max_channels = 6;
spec->multiout.num_dacs = 3;
if (codec->revision_id == AD1988A_REV2)
if (is_rev2(codec))
spec->multiout.dac_nids = ad1988_3stack_dac_nids_rev2;
else
spec->multiout.dac_nids = ad1988_3stack_dac_nids;
@@ -2095,7 +2098,7 @@ static int patch_ad1988(struct hda_codec *codec)
spec->channel_mode = ad1988_3stack_modes;
spec->num_channel_mode = ARRAY_SIZE(ad1988_3stack_modes);
spec->num_mixers = 2;
if (codec->revision_id == AD1988A_REV2)
if (is_rev2(codec))
spec->mixers[0] = ad1988_3stack_mixers1_rev2;
else
spec->mixers[0] = ad1988_3stack_mixers1;