aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/usbmixer_maps.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/sound/usb/usbmixer_maps.c b/sound/usb/usbmixer_maps.c
index c1264434e50a..37accb68652d 100644
--- a/sound/usb/usbmixer_maps.c
+++ b/sound/usb/usbmixer_maps.c
@@ -195,6 +195,22 @@ static struct usbmix_name_map linex_map[] = {
195 { 0 } /* terminator */ 195 { 0 } /* terminator */
196}; 196};
197 197
198static struct usbmix_name_map maya44_map[] = {
199 /* 1: IT line */
200 { 2, "Line Playback" }, /* FU */
201 /* 3: IT line */
202 { 4, "Line Playback" }, /* FU */
203 /* 5: IT pcm playback */
204 /* 6: MU */
205 { 7, "Master Playback" }, /* FU */
206 /* 8: OT speaker */
207 /* 9: IT line */
208 { 10, "Line Capture" }, /* FU */
209 /* 11: MU */
210 /* 12: OT pcm capture */
211 { }
212};
213
198/* Section "justlink_map" below added by James Courtier-Dutton <James@superbug.demon.co.uk> 214/* Section "justlink_map" below added by James Courtier-Dutton <James@superbug.demon.co.uk>
199 * sourced from Maplin Electronics (http://www.maplin.co.uk), part number A56AK 215 * sourced from Maplin Electronics (http://www.maplin.co.uk), part number A56AK
200 * Part has 2 connectors that act as a single output. (TOSLINK Optical for digital out, and 3.5mm Jack for Analogue out.) 216 * Part has 2 connectors that act as a single output. (TOSLINK Optical for digital out, and 3.5mm Jack for Analogue out.)
@@ -253,6 +269,10 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = {
253 .ignore_ctl_error = 1, 269 .ignore_ctl_error = 1,
254 }, 270 },
255 { 271 {
272 .id = USB_ID(0x0a92, 0x0091),
273 .map = maya44_map,
274 },
275 {
256 .id = USB_ID(0x0c45, 0x1158), 276 .id = USB_ID(0x0c45, 0x1158),
257 .map = justlink_map, 277 .map = justlink_map,
258 }, 278 },