Skip to content

Commit 34798d4

Browse files
committed
Rewrite mixer map for TRX40 Aorus Master
The Aorus Xtreme uses the same ID for audio controller, but the maps are very different. This successfully fixes all of the audio jacks on the back.
1 parent 7d5e891 commit 34798d4

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

sound/usb/mixer_maps.c

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -418,16 +418,25 @@ static const struct usbmix_connector_map trx40_mobo_connector_map[] = {
418418

419419
/* Rear panel + front mic on Gigabyte TRX40 Aorus Master with ALC1220-VB */
420420
static const struct usbmix_name_map aorus_master_alc1220vb_map[] = {
421-
{ 17, NULL }, /* OT, IEC958?, disabled */
421+
{ 18, NULL }, /* OT, IEC958 - broken response, disabled */
422422
{ 19, NULL, 12 }, /* FU, Input Gain Pad - broken response, disabled */
423423
{ 16, "Line Out" }, /* OT */
424424
{ 22, "Line Out Playback" }, /* FU */
425425
{ 7, "Line" }, /* IT */
426426
{ 19, "Line Capture" }, /* FU */
427427
{ 8, "Mic" }, /* IT */
428428
{ 20, "Mic Capture" }, /* FU */
429-
{ 9, "Front Mic" }, /* IT */
430-
{ 21, "Front Mic Capture" }, /* FU */
429+
{ 11, "Headphone" }, /* OT */
430+
{ 23, "Headphone Playback" }, /* FU */
431+
{}
432+
};
433+
434+
static const struct usbmix_connector_map aorus_master_alc1220vb_connector_map[] = {
435+
{ 10, 16 }, /* (Back) Speaker */
436+
{ 11, 17 }, /* Front Headphone */
437+
{ 13, 7 }, /* Line */
438+
{ 14, 8 }, /* Mic */
439+
{ 15, 9 }, /* Front Mic */
431440
{}
432441
};
433442

@@ -616,6 +625,7 @@ static const struct usbmix_ctl_map usbmix_ctl_maps[] = {
616625
{ /* Gigabyte TRX40 Aorus Master (rear panel + front mic) */
617626
.id = USB_ID(0x0414, 0xa001),
618627
.map = aorus_master_alc1220vb_map,
628+
.connector_map = aorus_master_alc1220vb_connector_map,
619629
},
620630
{ /* Gigabyte TRX40 Aorus Pro WiFi */
621631
.id = USB_ID(0x0414, 0xa002),

0 commit comments

Comments
 (0)