linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3 1/2] ALSA: hda/ca0132 - Fix AE-5 rear headphone pincfg.
@ 2020-12-10 17:35 Connor McAdams
  2020-12-10 17:35 ` [PATCH v3 2/2] ALSA: hda/ca0132 - Change Input Source enum strings Connor McAdams
  2020-12-10 18:59 ` [PATCH v3 1/2] ALSA: hda/ca0132 - Fix AE-5 rear headphone pincfg Takashi Iwai
  0 siblings, 2 replies; 3+ messages in thread
From: Connor McAdams @ 2020-12-10 17:35 UTC (permalink / raw)
  Cc: conmanx360, stable, Takashi Iwai, Jaroslav Kysela, Takashi Iwai,
	alsa-devel, linux-kernel

The Windows driver sets the pincfg for the AE-5's rear-headphone to
report as a microphone. This causes issues with Pulseaudio mistakenly
believing there is no headphone plugged in. In Linux, we should instead
set it to be a headphone.

Fixes: a6b0961b39896 ("ALSA: hda/ca0132 - fix AE-5 pincfg")
Cc: <stable@kernel.org>
Signed-off-by: Connor McAdams <conmanx360@gmail.com>
Link: https://lore.kernel.org/r/20201208195223.424753-1-conmanx360@gmail.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/pci/hda/patch_ca0132.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index 4fbec4258f58..e96db73c32f5 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -1223,7 +1223,7 @@ static const struct hda_pintbl ae5_pincfgs[] = {
 	{ 0x0e, 0x01c510f0 }, /* SPDIF In */
 	{ 0x0f, 0x01017114 }, /* Port A -- Rear L/R. */
 	{ 0x10, 0x01017012 }, /* Port D -- Center/LFE or FP Hp */
-	{ 0x11, 0x01a170ff }, /* Port B -- LineMicIn2 / Rear Headphone */
+	{ 0x11, 0x012170ff }, /* Port B -- LineMicIn2 / Rear Headphone */
 	{ 0x12, 0x01a170f0 }, /* Port C -- LineIn1 */
 	{ 0x13, 0x908700f0 }, /* What U Hear In*/
 	{ 0x18, 0x50d000f0 }, /* N/A */
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH v3 2/2] ALSA: hda/ca0132 - Change Input Source enum strings.
  2020-12-10 17:35 [PATCH v3 1/2] ALSA: hda/ca0132 - Fix AE-5 rear headphone pincfg Connor McAdams
@ 2020-12-10 17:35 ` Connor McAdams
  2020-12-10 18:59 ` [PATCH v3 1/2] ALSA: hda/ca0132 - Fix AE-5 rear headphone pincfg Takashi Iwai
  1 sibling, 0 replies; 3+ messages in thread
From: Connor McAdams @ 2020-12-10 17:35 UTC (permalink / raw)
  Cc: conmanx360, stable, Takashi Iwai, Jaroslav Kysela, Takashi Iwai,
	Takashi Sakamoto, alsa-devel, linux-kernel

Change the Input Source enumerated control's strings to make it play
nice with pulseaudio.

Fixes: 7cb9d94c05de9 ("ALSA: hda/ca0132: add alt_select_in/out for R3Di + SBZ")
Cc: <stable@kernel.org>
Signed-off-by: Connor McAdams <conmanx360@gmail.com>
Link: https://lore.kernel.org/r/20201208195223.424753-2-conmanx360@gmail.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/pci/hda/patch_ca0132.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index e96db73c32f5..793dc5d501a5 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -95,7 +95,7 @@ enum {
 };
 
 /* Strings for Input Source Enum Control */
-static const char *const in_src_str[3] = {"Rear Mic", "Line", "Front Mic" };
+static const char *const in_src_str[3] = { "Microphone", "Line In", "Front Microphone" };
 #define IN_SRC_NUM_OF_INPUTS 3
 enum {
 	REAR_MIC,
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH v3 1/2] ALSA: hda/ca0132 - Fix AE-5 rear headphone pincfg.
  2020-12-10 17:35 [PATCH v3 1/2] ALSA: hda/ca0132 - Fix AE-5 rear headphone pincfg Connor McAdams
  2020-12-10 17:35 ` [PATCH v3 2/2] ALSA: hda/ca0132 - Change Input Source enum strings Connor McAdams
@ 2020-12-10 18:59 ` Takashi Iwai
  1 sibling, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2020-12-10 18:59 UTC (permalink / raw)
  To: Connor McAdams
  Cc: stable, Jaroslav Kysela, Takashi Iwai, alsa-devel, linux-kernel

On Thu, 10 Dec 2020 18:35:48 +0100,
Connor McAdams wrote:
> 
> The Windows driver sets the pincfg for the AE-5's rear-headphone to
> report as a microphone. This causes issues with Pulseaudio mistakenly
> believing there is no headphone plugged in. In Linux, we should instead
> set it to be a headphone.
> 
> Fixes: a6b0961b39896 ("ALSA: hda/ca0132 - fix AE-5 pincfg")
> Cc: <stable@kernel.org>
> Signed-off-by: Connor McAdams <conmanx360@gmail.com>
> Link: https://lore.kernel.org/r/20201208195223.424753-1-conmanx360@gmail.com
> Signed-off-by: Takashi Iwai <tiwai@suse.de>

Now replaced with those two patches.  Thanks.


Takashi

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-12-10 19:01 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-10 17:35 [PATCH v3 1/2] ALSA: hda/ca0132 - Fix AE-5 rear headphone pincfg Connor McAdams
2020-12-10 17:35 ` [PATCH v3 2/2] ALSA: hda/ca0132 - Change Input Source enum strings Connor McAdams
2020-12-10 18:59 ` [PATCH v3 1/2] ALSA: hda/ca0132 - Fix AE-5 rear headphone pincfg Takashi Iwai

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).