[ALSA] Fix Mic/CLFE sharing on AD1985
AC97 Codec
Fixed Mic/CLFE jack sharing on AD1985 codec.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index bcb1a20..5520f5d 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -1526,13 +1526,8 @@
.get = snd_ac97_ad1888_downmix_get,
.put = snd_ac97_ad1888_downmix_put
},
-#if 0
- AC97_SINGLE("Surround Jack as Input", AC97_AD_MISC, 12, 1, 0),
- AC97_SINGLE("Center/LFE Jack as Input", AC97_AD_MISC, 11, 1, 0),
-#else
AC97_SURROUND_JACK_MODE_CTL,
AC97_CHANNEL_MODE_CTL,
-#endif
};
static int patch_ad1888_specific(ac97_t *ac97)
@@ -1601,6 +1596,18 @@
AC97_SINGLE("Exchange Center/LFE", AC97_AD_SERIAL_CFG, 3, 1, 0)
};
+static void ad1985_update_jacks(ac97_t *ac97)
+{
+ /* shared Line-In */
+ snd_ac97_update_bits(ac97, AC97_AD_MISC, 1 << 12,
+ is_shared_linein(ac97) ? 0 : 1 << 12);
+ /* shared Mic */
+ snd_ac97_update_bits(ac97, AC97_AD_MISC, 1 << 11,
+ is_shared_micin(ac97) ? 0 : 1 << 11);
+ snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 9 << 11,
+ is_shared_micin(ac97) ? 0 : 9 << 11);
+}
+
static int patch_ad1985_specific(ac97_t *ac97)
{
int err;
@@ -1616,7 +1623,7 @@
#ifdef CONFIG_PM
.resume = ad18xx_resume,
#endif
- .update_jacks = ad1888_update_jacks,
+ .update_jacks = ad1985_update_jacks,
};
int patch_ad1985(ac97_t * ac97)