2020-08-03 00:30:07

by Connor McAdams

Subject: [PATCH 1/3] ALSA: hda/ca0132 - Fix ZxR Headphone gain control get value.

When the ZxR headphone gain control was added, the ca0132_switch_get
function was not updated, which meant that the changes to the control
state were not saved when entering/exiting alsamixer.

Signed-off-by: Connor McAdams <[email protected]>
---
sound/pci/hda/patch_ca0132.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index 19c575fd28a1..2cbe01d59c16 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -5748,6 +5748,11 @@ static int ca0132_switch_get(struct snd_kcontrol *kcontrol,
return 0;
}

+ if (nid == ZXR_HEADPHONE_GAIN) {
+ *valp = spec->zxr_gain_set;
+ return 0;
+ }
+
return 0;
}

--
2.20.1

2020-08-03 00:31:11

by Connor McAdams

Subject: [PATCH 3/3] ALSA: hda/ca0132 - Fix AE-5 microphone selection commands.

The ca0113 command had the wrong group_id, 0x48 when it should've been
0x30. The front microphone selection should now work.

Signed-off-by: Connor McAdams <[email protected]>
---
sound/pci/hda/patch_ca0132.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index 40fa9d82ef95..b7dbf2e7f77a 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -4672,7 +4672,7 @@ static int ca0132_alt_select_in(struct hda_codec *codec)
tmp = FLOAT_ONE;
break;
case QUIRK_AE5:
- ca0113_mmio_command_set(codec, 0x48, 0x28, 0x00);
+ ca0113_mmio_command_set(codec, 0x30, 0x28, 0x00);
tmp = FLOAT_THREE;
break;
default:
@@ -4718,7 +4718,7 @@ static int ca0132_alt_select_in(struct hda_codec *codec)
r3di_gpio_mic_set(codec, R3DI_REAR_MIC);
break;
case QUIRK_AE5:
- ca0113_mmio_command_set(codec, 0x48, 0x28, 0x00);
+ ca0113_mmio_command_set(codec, 0x30, 0x28, 0x00);
break;
default:
break;
@@ -4757,7 +4757,7 @@ static int ca0132_alt_select_in(struct hda_codec *codec)
tmp = FLOAT_ONE;
break;
case QUIRK_AE5:
- ca0113_mmio_command_set(codec, 0x48, 0x28, 0x3f);
+ ca0113_mmio_command_set(codec, 0x30, 0x28, 0x3f);
tmp = FLOAT_THREE;
break;
default:
--
2.20.1

2020-08-03 00:31:58

by Connor McAdams

Subject: [PATCH 2/3] ALSA: hda/ca0132 - Add new quirk ID for Recon3D.

Add a new quirk ID for the Recon3D, as tested by me.

Signed-off-by: Connor McAdams <[email protected]>
---
sound/pci/hda/patch_ca0132.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index 2cbe01d59c16..40fa9d82ef95 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -1182,6 +1182,7 @@ static const struct snd_pci_quirk ca0132_quirks[] = {
SND_PCI_QUIRK(0x1458, 0xA036, "Gigabyte GA-Z170X-Gaming 7", QUIRK_R3DI),
SND_PCI_QUIRK(0x3842, 0x1038, "EVGA X99 Classified", QUIRK_R3DI),
SND_PCI_QUIRK(0x1102, 0x0013, "Recon3D", QUIRK_R3D),
+ SND_PCI_QUIRK(0x1102, 0x0018, "Recon3D", QUIRK_R3D),
SND_PCI_QUIRK(0x1102, 0x0051, "Sound Blaster AE-5", QUIRK_AE5),
{}
};
--
2.20.1

2020-08-03 06:21:16

by Takashi Iwai

Subject: Re: [PATCH 1/3] ALSA: hda/ca0132 - Fix ZxR Headphone gain control get value.

On Mon, 03 Aug 2020 02:29:25 +0200,
Connor McAdams wrote:
>
> When the ZxR headphone gain control was added, the ca0132_switch_get
> function was not updated, which meant that the changes to the control
> state were not saved when entering/exiting alsamixer.
>
> Signed-off-by: Connor McAdams <[email protected]>

Applied, thanks.


Takashi

2020-08-03 06:21:27

by Takashi Iwai

Subject: Re: [PATCH 2/3] ALSA: hda/ca0132 - Add new quirk ID for Recon3D.

On Mon, 03 Aug 2020 02:29:26 +0200,
Connor McAdams wrote:
>
> Add a new quirk ID for the Recon3D, as tested by me.
>
> Signed-off-by: Connor McAdams <[email protected]>

Applied, thanks.


Takashi

2020-08-03 06:21:41

by Takashi Iwai

Subject: Re: [PATCH 3/3] ALSA: hda/ca0132 - Fix AE-5 microphone selection commands.

On Mon, 03 Aug 2020 02:29:27 +0200,
Connor McAdams wrote:
>
> The ca0113 command had the wrong group_id, 0x48 when it should've been
> 0x30. The front microphone selection should now work.
>
> Signed-off-by: Connor McAdams <[email protected]>

Applied, thanks.


Takashi