Skip to contentSkip to conversation

ALSA: hda/ca0132 - Fix ZxR Headphone gain control get value.

PATCH Applied Connor McAdams 2 participants 6 messages Aug 3, 2020 Sound

lore
Share & tools
lore
#0 lore raw

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.

---
 sound/pci/hda/patch_ca0132.c | 5 +++++
 1 file changed, 5 insertions(+)
sound/pci/hda/patch_ca0132.c +5 -0
index 19c575fd28a1..2cbe01d59c16 100644
@@ -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;
 }
 
Signature · 1 line
2.20.1
#1 lore raw

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

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

---
 sound/pci/hda/patch_ca0132.c | 1 +
 1 file changed, 1 insertion(+)
sound/pci/hda/patch_ca0132.c +1 -0
index 2cbe01d59c16..40fa9d82ef95 100644
@@ -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),
 	{}
 };
Signature · 1 line
2.20.1
#3 lore raw

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

In reply to Connor McAdams

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

---
 sound/pci/hda/patch_ca0132.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
sound/pci/hda/patch_ca0132.c +3 -3
index 40fa9d82ef95..b7dbf2e7f77a 100644
@@ -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:
Signature · 1 line
2.20.1
Applied
#4 lore raw

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

Quoted 5 lines · Connor McAdams

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

Applied, thanks.

Takashi