]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
ALSA: hda/ca0132 - Add AE-7 microphone selection commands.
authorConnor McAdams <conmanx360@gmail.com>
Tue, 25 Aug 2020 20:10:37 +0000 (16:10 -0400)
committerStefan Bader <stefan.bader@canonical.com>
Mon, 9 Nov 2020 13:49:17 +0000 (14:49 +0100)
BugLink: https://bugs.launchpad.net/bugs/1902115
[ Upstream commit ed93f9750c6c2ed371347d0aac3dcd31cb9cf256 ]

Add AE-7 quirk data for setting of microphone. The AE-7 has no front
panel connector, so only rear-mic/line-in have new commands.

Signed-off-by: Connor McAdams <conmanx360@gmail.com>
Link: https://lore.kernel.org/r/20200825201040.30339-19-conmanx360@gmail.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Ian May <ian.may@canonical.com>
sound/pci/hda/patch_ca0132.c

index d126ad3707d0e8aa0db6fe29df35fce689a457f9..5b640bcc2de416b5c6a282467df4791d53c0e848 100644 (file)
@@ -4674,6 +4674,15 @@ static int ca0132_alt_select_in(struct hda_codec *codec)
                        ca0113_mmio_command_set(codec, 0x30, 0x28, 0x00);
                        tmp = FLOAT_THREE;
                        break;
+               case QUIRK_AE7:
+                       ca0113_mmio_command_set(codec, 0x30, 0x28, 0x00);
+                       tmp = FLOAT_THREE;
+                       chipio_set_conn_rate(codec, MEM_CONNID_MICIN2,
+                                       SR_96_000);
+                       chipio_set_conn_rate(codec, MEM_CONNID_MICOUT2,
+                                       SR_96_000);
+                       dspio_set_uint_param(codec, 0x80, 0x01, FLOAT_ZERO);
+                       break;
                default:
                        tmp = FLOAT_ONE;
                        break;
@@ -4719,6 +4728,14 @@ static int ca0132_alt_select_in(struct hda_codec *codec)
                case QUIRK_AE5:
                        ca0113_mmio_command_set(codec, 0x30, 0x28, 0x00);
                        break;
+               case QUIRK_AE7:
+                       ca0113_mmio_command_set(codec, 0x30, 0x28, 0x3f);
+                       chipio_set_conn_rate(codec, MEM_CONNID_MICIN2,
+                                       SR_96_000);
+                       chipio_set_conn_rate(codec, MEM_CONNID_MICOUT2,
+                                       SR_96_000);
+                       dspio_set_uint_param(codec, 0x80, 0x01, FLOAT_ZERO);
+                       break;
                default:
                        break;
                }
@@ -4728,7 +4745,10 @@ static int ca0132_alt_select_in(struct hda_codec *codec)
                if (ca0132_quirk(spec) == QUIRK_R3DI)
                        chipio_set_conn_rate(codec, 0x0F, SR_96_000);
 
-               tmp = FLOAT_ZERO;
+               if (ca0132_quirk(spec) == QUIRK_AE7)
+                       tmp = FLOAT_THREE;
+               else
+                       tmp = FLOAT_ZERO;
                dspio_set_uint_param(codec, 0x80, 0x00, tmp);
 
                switch (ca0132_quirk(spec)) {