Commit 9cdc3529 authored by Daniel Mack's avatar Daniel Mack Committed by Takashi Iwai
Browse files

ALSA: usb-audio: Add quirks for Audio Kontrol 6 



This new device by Native Instruments is also compliant to the USB
standard v2.0, but hides this detail at when connected.

It needs the same boot quirks than other models, and also has two
non-class-compliant mixer controls.

Signed-off-by: default avatarDaniel Mack <zonque@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e217b960

sound/usb/mixer_quirks.c

+17 −0
Original line number Original line Diff line number Diff line
@@ -398,6 +398,17 @@ static int snd_nativeinstruments_control_put(struct snd_kcontrol *kcontrol, 
	return 0;

	return 0;

}

}





static struct snd_kcontrol_new snd_nativeinstruments_ak6_mixers[] = {

	{

		.name = "Direct Monitor Channel 1+2",

		.private_value = _MAKE_NI_CONTROL(0x03, 0x03),

	},

	{

		.name = "Direct Monitor Channel 3+4",

		.private_value = _MAKE_NI_CONTROL(0x03, 0x05),

	},

};



static struct snd_kcontrol_new snd_nativeinstruments_ta6_mixers[] = {

static struct snd_kcontrol_new snd_nativeinstruments_ta6_mixers[] = {

	{

	{

		.name = "Direct Thru Channel A",

		.name = "Direct Thru Channel A",
@@ -526,6 +537,12 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) 
		err = snd_xonar_u1_controls_create(mixer);

		err = snd_xonar_u1_controls_create(mixer);

		break;

		break;





	case USB_ID(0x17cc, 0x1001): /* Audio Kontrol 6 */

		err = snd_nativeinstruments_create_mixer(mixer,

				snd_nativeinstruments_ak6_mixers,

				ARRAY_SIZE(snd_nativeinstruments_ak6_mixers));

		break;



	case USB_ID(0x17cc, 0x1011): /* Traktor Audio 6 */

	case USB_ID(0x17cc, 0x1011): /* Traktor Audio 6 */

		err = snd_nativeinstruments_create_mixer(mixer,

		err = snd_nativeinstruments_create_mixer(mixer,

				snd_nativeinstruments_ta6_mixers,

				snd_nativeinstruments_ta6_mixers,

sound/usb/quirks-table.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -2331,6 +2331,12 @@ YAMAHA_DEVICE(0x7010, "UB99"), 
},

},





/* Native Instruments MK2 series */

/* Native Instruments MK2 series */

{

	/* Audio Kontrol 6 */

	.match_flags = USB_DEVICE_ID_MATCH_DEVICE,

	.idVendor = 0x17cc,

	.idProduct = 0x1000,

},

{

{

	/* Traktor Audio 6 */

	/* Traktor Audio 6 */

	.match_flags = USB_DEVICE_ID_MATCH_DEVICE,

	.match_flags = USB_DEVICE_ID_MATCH_DEVICE,

sound/usb/quirks.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -539,6 +539,7 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev, 
		/* Access Music VirusTI Desktop */

		/* Access Music VirusTI Desktop */

		return snd_usb_accessmusic_boot_quirk(dev);

		return snd_usb_accessmusic_boot_quirk(dev);





	case USB_ID(0x17cc, 0x1000): /* Audio Kontrol 6 */

	case USB_ID(0x17cc, 0x1010): /* Traktor Audio 6 */

	case USB_ID(0x17cc, 0x1010): /* Traktor Audio 6 */

	case USB_ID(0x17cc, 0x1020): /* Traktor Audio 10 */

	case USB_ID(0x17cc, 0x1020): /* Traktor Audio 10 */

		return snd_usb_nativeinstruments_boot_quirk(dev);

		return snd_usb_nativeinstruments_boot_quirk(dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE