[PATCH v2 1/3] ALSA: hda/ca0132 - Fix AE-5 rear headphone pincfg.
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 --- sound/pci/hda/patch_ca0132.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
v2 changes: - Add fixes references to previous commits that these patches now fix.
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 */
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 --- 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,
Make sure GPIO pin for surround channel mute is set to 0 when speaker output is selected.
Fixes: def3f0a5c7007 ("ALSA: hda/ca0132 - Add quirk output selection structures.") Cc: stable@kernel.org Signed-off-by: Connor McAdams conmanx360@gmail.com --- 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 793dc5d501a5..6d647d461eab 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -1390,7 +1390,7 @@ static const struct ca0132_alt_out_set_quirk_data quirk_out_set_data[] = { .has_hda_gpio = false, .mmio_gpio_count = 3, .mmio_gpio_pin = { 2, 3, 5 }, - .mmio_gpio_set = { 1, 1, 0 }, + .mmio_gpio_set = { 1, 0, 0 }, .scp_cmds_count = 0, .has_chipio_write = false, },
Woops, sent previous email on the first version of this patch.
This patch is a mistake. Not sure why I did this.
On Tue, Dec 8, 2020 at 2:52 PM Connor McAdams conmanx360@gmail.com wrote:
Make sure GPIO pin for surround channel mute is set to 0 when speaker output is selected.
Fixes: def3f0a5c7007 ("ALSA: hda/ca0132 - Add quirk output selection structures.") Cc: stable@kernel.org Signed-off-by: Connor McAdams conmanx360@gmail.com
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 793dc5d501a5..6d647d461eab 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -1390,7 +1390,7 @@ static const struct ca0132_alt_out_set_quirk_data quirk_out_set_data[] = { .has_hda_gpio = false, .mmio_gpio_count = 3, .mmio_gpio_pin = { 2, 3, 5 },
.mmio_gpio_set = { 1, 1, 0 },
.mmio_gpio_set = { 1, 0, 0 }, .scp_cmds_count = 0, .has_chipio_write = false, },-- 2.25.1
On Thu, 10 Dec 2020 18:16:00 +0100, Connor McAdams wrote:
Woops, sent previous email on the first version of this patch.
This patch is a mistake. Not sure why I did this.
OK, then could you resubmit v3? Now I reverted the v2 patches.
Takashi
Will do. Sorry about that.
On Thu, Dec 10, 2020 at 12:22 PM Takashi Iwai tiwai@suse.de wrote:
On Thu, 10 Dec 2020 18:16:00 +0100, Connor McAdams wrote:
Woops, sent previous email on the first version of this patch.
This patch is a mistake. Not sure why I did this.
OK, then could you resubmit v3? Now I reverted the v2 patches.
Takashi
On Tue, 08 Dec 2020 20:52:20 +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
Thanks, applied all three patches now.
Takashi
On Tue, 08 Dec 2020 21:27:45 +0100, Takashi Iwai wrote:
On Tue, 08 Dec 2020 20:52:20 +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
Thanks, applied all three patches now.
BTW, there is a bug report about AE-7. Could you take a look? https://bugzilla.kernel.org/show_bug.cgi?id=209281
Takashi
participants (2)
-
Connor McAdams -
Takashi Iwai