Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29769d53 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/caiaq' into for-linus 

* fix/caiaq:
  ALSA: snd_usb_caiaq: add support for Audio2DJ
parents 7679d5c6 b30c4947

sound/usb/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ config SND_USB_CAIAQ 
	    * Native Instruments Kore Controller

	    * Native Instruments Kore Controller 2

	    * Native Instruments Audio Kontrol 1

	    * Native Instruments Audio 2 DJ

	    * Native Instruments Audio 4 DJ

	    * Native Instruments Audio 8 DJ

	    * Native Instruments Guitar Rig Session I/O

sound/usb/caiaq/audio.c

+1 −0
Original line number Diff line number Diff line
@@ -646,6 +646,7 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev) 
	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_GUITARRIGMOBILE):

		dev->samplerates |= SNDRV_PCM_RATE_192000;

		/* fall thru */

	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO2DJ):

	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO4DJ):

	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO8DJ):

		dev->samplerates |= SNDRV_PCM_RATE_88200;

sound/usb/caiaq/device.c

+7 −1
Original line number Diff line number Diff line
@@ -35,13 +35,14 @@ 
#include "input.h"



MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");

MODULE_DESCRIPTION("caiaq USB audio, version 1.3.18");

MODULE_DESCRIPTION("caiaq USB audio, version 1.3.19");

MODULE_LICENSE("GPL");

MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"

			 "{Native Instruments, RigKontrol3},"

			 "{Native Instruments, Kore Controller},"

			 "{Native Instruments, Kore Controller 2},"

			 "{Native Instruments, Audio Kontrol 1},"

			 "{Native Instruments, Audio 2 DJ},"

			 "{Native Instruments, Audio 4 DJ},"

			 "{Native Instruments, Audio 8 DJ},"

			 "{Native Instruments, Session I/O},"
@@ -121,6 +122,11 @@ static struct usb_device_id snd_usb_id_table[] = { 
		.idVendor =     USB_VID_NATIVEINSTRUMENTS,

		.idProduct =    USB_PID_AUDIO4DJ

	},

	{

		.match_flags =  USB_DEVICE_ID_MATCH_DEVICE,

		.idVendor =     USB_VID_NATIVEINSTRUMENTS,

		.idProduct =    USB_PID_AUDIO2DJ

	},

	{ /* terminator */ }

};

sound/usb/caiaq/device.h

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#define USB_PID_KORECONTROLLER	0x4711

#define USB_PID_KORECONTROLLER2	0x4712

#define USB_PID_AK1		0x0815

#define USB_PID_AUDIO2DJ	0x041c

#define USB_PID_AUDIO4DJ	0x0839

#define USB_PID_AUDIO8DJ	0x1978

#define USB_PID_SESSIONIO	0x1915