Commit a43c1c41 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: usb-audio: Add static mapping table for ALC1220-VB-based mobos 

TRX40 mobos from MSI and others with ALC1220-VB USB-audio device need
yet more quirks for the proper control names.

This patch provides the mapping table for those boards, correcting the
FU names for volume and mute controls as well as the terminal names
for jack controls.  It also improves build_connector_control() not to
add the directional suffix blindly if the string is given from the
mapping table.

With this patch applied, the new UCM profiles will be effective.

BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=206873
Link: https://lore.kernel.org/r/20200420062036.28567-1-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a8cf44f0

sound/usb/mixer.c

+9 −3
Original line number Diff line number Diff line
@@ -1776,8 +1776,10 @@ static void build_connector_control(struct usb_mixer_interface *mixer, 
{

	struct snd_kcontrol *kctl;

	struct usb_mixer_elem_info *cval;

	const struct usbmix_name_map *map;



	if (check_ignored_ctl(find_map(imap, term->id, 0)))

	map = find_map(imap, term->id, 0);

	if (check_ignored_ctl(map))

		return;



	cval = kzalloc(sizeof(*cval), GFP_KERNEL);
@@ -1809,6 +1811,10 @@ static void build_connector_control(struct usb_mixer_interface *mixer, 
		usb_mixer_elem_info_free(cval);

		return;

	}



	if (check_mapped_name(map, kctl->id.name, sizeof(kctl->id.name)))

		strlcat(kctl->id.name, " Jack", sizeof(kctl->id.name));

	else

		get_connector_control_name(mixer, term, is_input, kctl->id.name,

					   sizeof(kctl->id.name));

	kctl->private_free = snd_usb_mixer_elem_free;

sound/usb/mixer_maps.c

+21 −3
Original line number Diff line number Diff line
@@ -369,6 +369,24 @@ static const struct usbmix_name_map asus_rog_map[] = { 
	{}

};



/* TRX40 mobos with Realtek ALC1220-VB */

static const struct usbmix_name_map trx40_mobo_map[] = {

	{ 18, NULL }, /* OT, IEC958 - broken response, disabled */

	{ 19, NULL, 12 }, /* FU, Input Gain Pad - broken response, disabled */

	{ 16, "Speaker" },		/* OT */

	{ 22, "Speaker Playback" },	/* FU */

	{ 7, "Line" },			/* IT */

	{ 19, "Line Capture" },		/* FU */

	{ 17, "Front Headphone" },	/* OT */

	{ 23, "Front Headphone Playback" },	/* FU */

	{ 8, "Mic" },			/* IT */

	{ 20, "Mic Capture" },		/* FU */

	{ 9, "Front Mic" },		/* IT */

	{ 21, "Front Mic Capture" },	/* FU */

	{ 24, "IEC958 Playback" },	/* FU */

	{}

};



/*

 * Control map entries

 */
@@ -500,7 +518,7 @@ static const struct usbmix_ctl_map usbmix_ctl_maps[] = { 
	},

	{	/* Gigabyte TRX40 Aorus Pro WiFi */

		.id = USB_ID(0x0414, 0xa002),

		.map = asus_rog_map,

		.map = trx40_mobo_map,

	},

	{	/* ASUS ROG Zenith II */

		.id = USB_ID(0x0b05, 0x1916),
@@ -512,11 +530,11 @@ static const struct usbmix_ctl_map usbmix_ctl_maps[] = { 
	},

	{	/* MSI TRX40 Creator */

		.id = USB_ID(0x0db0, 0x0d64),

		.map = asus_rog_map,

		.map = trx40_mobo_map,

	},

	{	/* MSI TRX40 */

		.id = USB_ID(0x0db0, 0x543d),

		.map = asus_rog_map,

		.map = trx40_mobo_map,

	},

	{ 0 } /* terminator */

};

sound/usb/quirks-table.h

+14 −0
Original line number Diff line number Diff line
@@ -3635,4 +3635,18 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), 
	}

},



#define ALC1220_VB_DESKTOP(vend, prod) { \

	USB_DEVICE(vend, prod),	\

	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { \

		.vendor_name = "Realtek", \

		.product_name = "ALC1220-VB-DT", \

		.profile_name = "Realtek-ALC1220-VB-Desktop", \

		.ifnum = QUIRK_NO_INTERFACE \

	} \

}

ALC1220_VB_DESKTOP(0x0414, 0xa002), /* Gigabyte TRX40 Aorus Pro WiFi */

ALC1220_VB_DESKTOP(0x0db0, 0x0d64), /* MSI TRX40 Creator */

ALC1220_VB_DESKTOP(0x0db0, 0x543d), /* MSI TRX40 */

#undef ALC1220_VB_DESKTOP



#undef USB_DEVICE_VENDOR_SPEC

CRA Git | Maintained and supported by SUSTech CRA and CCSE