Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

[sfrench/cifs-2.6.git] / sound / usb / usbmixer_maps.c

diff --git a/sound/usb/usbmixer_maps.c b/sound/usb/usbmixer_maps.c
index 37accb68652d0732aacff50dd15a4a7b36663ee3..d755be0ad8115da5c1296211678f81a7774277d5 100644 (file)
--- a/sound/usb/usbmixer_maps.c
+++ b/sound/usb/usbmixer_maps.c
@@ -187,6 +187,13 @@ static struct usbmix_selector_map audigy2nx_selectors[] = {
        { 0 } /* terminator */
 };
 
+/* Creative SoundBlaster Live! 24-bit External */
+static struct usbmix_name_map live24ext_map[] = {
+       /* 2: PCM Playback Volume */
+       { 5, "Mic Capture" }, /* FU, default PCM Capture Volume */
+       { 0 } /* terminator */
+};
+
 /* LineX FM Transmitter entry - needed to bypass controls bug */
 static struct usbmix_name_map linex_map[] = {
        /* 1: IT pcm */
@@ -234,6 +241,26 @@ static struct usbmix_name_map justlink_map[] = {
        { 0 } /* terminator */
 };
 
+/* TerraTec Aureon 5.1 MkII USB */
+static struct usbmix_name_map aureon_51_2_map[] = {
+       /* 1: IT USB */
+       /* 2: IT Mic */
+       /* 3: IT Line */
+       /* 4: IT SPDIF */
+       /* 5: OT SPDIF */
+       /* 6: OT Speaker */
+       /* 7: OT USB */
+       { 8, "Capture Source" }, /* SU */
+       { 9, "Master Playback" }, /* FU */
+       { 10, "Mic Capture" }, /* FU */
+       { 11, "Line Capture" }, /* FU */
+       { 12, "IEC958 In Capture" }, /* FU */
+       { 13, "Mic Playback" }, /* FU */
+       { 14, "Line Playback" }, /* FU */
+       /* 15: MU */
+       {} /* terminator */
+};
+
 /*
  * Control map entries
  */
@@ -253,6 +280,10 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = {
                .map = audigy2nx_map,
                .selector_map = audigy2nx_selectors,
        },
+       {
+               .id = USB_ID(0x041e, 0x3040),
+               .map = live24ext_map,
+       },
        {
                /* Hercules DJ Console (Windows Edition) */
                .id = USB_ID(0x06f8, 0xb000),
@@ -276,6 +307,10 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = {
                .id = USB_ID(0x0c45, 0x1158),
                .map = justlink_map,
        },
+       {
+               .id = USB_ID(0x0ccd, 0x0028),
+               .map = aureon_51_2_map,
+       },
        { 0 } /* terminator */
 };