Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c26a8de2 authored by Randy Cushman's avatar Randy Cushman Committed by Jaroslav Kysela
Browse files

[ALSA] ac97 - fix AD shared shared jack control logic 



This patch fixes the control logic for shared
Microphone in/Center+LFE out and Line in/Surround out jacks
for Analog Devices AD1888, AD1980 and AD1985 AC '97 CODECs.

Signed-off-by: default avatarRandy Cushman <rcushman_linux@earthlink.net>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 1fc273b8

sound/pci/ac97/ac97_patch.c

+8 −5
Original line number Diff line number Diff line
@@ -1962,9 +1962,11 @@ static int snd_ac97_ad1888_downmix_put(struct snd_kcontrol *kcontrol, struct snd 
static void ad1888_update_jacks(struct snd_ac97 *ac97)

{

	unsigned short val = 0;

	if (! is_shared_linein(ac97))

	/* clear LODIS if shared jack is to be used for Surround out */

	if (is_shared_linein(ac97))

		val |= (1 << 12);

	if (! is_shared_micin(ac97))

	/* clear CLDIS if shared jack is to be used for C/LFE out */

	if (is_shared_micin(ac97))

		val |= (1 << 11);

	/* shared Line-In */

	snd_ac97_update_bits(ac97, AC97_AD_MISC, (1 << 11) | (1 << 12), val);
@@ -2136,8 +2138,9 @@ static const struct snd_kcontrol_new snd_ac97_ad1985_controls[] = { 
static void ad1985_update_jacks(struct snd_ac97 *ac97)

{

	ad1888_update_jacks(ac97);

	/* clear OMS if shared jack is to be used for C/LFE out */

	snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 1 << 9,

			     is_shared_micin(ac97) ? 0 : 1 << 9);

			     is_shared_micin(ac97) ? 1 << 9 : 0);

}



static int patch_ad1985_specific(struct snd_ac97 *ac97)