tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

staging: line6: Add support for POD HD400 to line6usb driver

This patch adds support for the Line 6 POD HD400 to the line6usb driver.

Signed-off-by: Chris Bajumpaa <cbajumpa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Chris Bajumpaa and committed by
Greg Kroah-Hartman 1785faac 17d41165

+14 -1
+7
drivers/staging/line6/driver.c
··· 38 38 {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_GUITARPORT)}, 39 39 {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_POCKETPOD)}, 40 40 {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODHD300)}, 41 + {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODHD400)}, 41 42 {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODHD500)}, 42 43 {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODSTUDIO_GX)}, 43 44 {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODSTUDIO_UX1)}, ··· 65 64 { LINE6_BIT_GUITARPORT, "GuitarPort", "GuitarPort", LINE6_BIT_PCM }, 66 65 { LINE6_BIT_POCKETPOD, "PocketPOD", "Pocket POD", LINE6_BIT_CONTROL }, 67 66 { LINE6_BIT_PODHD300, "PODHD300", "POD HD300", LINE6_BIT_CONTROL_PCM_HWMON }, 67 + { LINE6_BIT_PODHD400, "PODHD400", "POD HD400", LINE6_BIT_CONTROL_PCM_HWMON }, 68 68 { LINE6_BIT_PODHD500, "PODHD500", "POD HD500", LINE6_BIT_CONTROL_PCM_HWMON }, 69 69 { LINE6_BIT_PODSTUDIO_GX, "PODStudioGX", "POD Studio GX", LINE6_BIT_PCM }, 70 70 { LINE6_BIT_PODSTUDIO_UX1, "PODStudioUX1", "POD Studio UX1", LINE6_BIT_PCM }, ··· 354 352 break; 355 353 356 354 case LINE6_DEVID_PODHD300: 355 + case LINE6_DEVID_PODHD400: 357 356 case LINE6_DEVID_PODHD500: 358 357 break; /* let userspace handle MIDI */ 359 358 ··· 687 684 case LINE6_DEVID_PODXT: 688 685 case LINE6_DEVID_PODXTPRO: 689 686 case LINE6_DEVID_PODHD300: 687 + case LINE6_DEVID_PODHD400: 690 688 alternate = 5; 691 689 break; 692 690 ··· 742 738 break; 743 739 744 740 case LINE6_DEVID_PODHD300: 741 + case LINE6_DEVID_PODHD400: 745 742 size = sizeof(struct usb_line6_podhd); 746 743 ep_read = 0x84; 747 744 ep_write = 0x03; ··· 901 896 break; 902 897 903 898 case LINE6_DEVID_PODHD300: 899 + case LINE6_DEVID_PODHD400: 904 900 case LINE6_DEVID_PODHD500: 905 901 ret = line6_podhd_init(interface, 906 902 (struct usb_line6_podhd *)line6); ··· 1029 1023 break; 1030 1024 1031 1025 case LINE6_DEVID_PODHD300: 1026 + case LINE6_DEVID_PODHD400: 1032 1027 case LINE6_DEVID_PODHD500: 1033 1028 line6_podhd_disconnect(interface); 1034 1029 break;
+1
drivers/staging/line6/pcm.c
··· 436 436 case LINE6_DEVID_PODXTLIVE: 437 437 case LINE6_DEVID_PODXTPRO: 438 438 case LINE6_DEVID_PODHD300: 439 + case LINE6_DEVID_PODHD400: 439 440 ep_read = 0x82; 440 441 ep_write = 0x01; 441 442 break;
+6 -1
drivers/staging/line6/usbdefs.h
··· 25 25 #define LINE6_DEVID_GUITARPORT 0x4750 26 26 #define LINE6_DEVID_POCKETPOD 0x5051 27 27 #define LINE6_DEVID_PODHD300 0x5057 28 + #define LINE6_DEVID_PODHD400 0x5058 28 29 #define LINE6_DEVID_PODHD500 0x414D 29 30 #define LINE6_DEVID_PODSTUDIO_GX 0x4153 30 31 #define LINE6_DEVID_PODSTUDIO_UX1 0x4150 ··· 49 48 LINE6_INDEX_GUITARPORT, 50 49 LINE6_INDEX_POCKETPOD, 51 50 LINE6_INDEX_PODHD300, 51 + LINE6_INDEX_PODHD400, 52 52 LINE6_INDEX_PODHD500, 53 53 LINE6_INDEX_PODSTUDIO_GX, 54 54 LINE6_INDEX_PODSTUDIO_UX1, ··· 70 68 LINE6_BIT(GUITARPORT), 71 69 LINE6_BIT(POCKETPOD), 72 70 LINE6_BIT(PODHD300), 71 + LINE6_BIT(PODHD400), 73 72 LINE6_BIT(PODHD500), 74 73 LINE6_BIT(PODSTUDIO_GX), 75 74 LINE6_BIT(PODSTUDIO_UX1), ··· 91 88 LINE6_BITS_PODXTALL = LINE6_BIT_PODXT | LINE6_BIT_PODXTLIVE | 92 89 LINE6_BIT_PODXTPRO, 93 90 LINE6_BITS_PODX3ALL = LINE6_BIT_PODX3 | LINE6_BIT_PODX3LIVE, 94 - LINE6_BITS_PODHDALL = LINE6_BIT_PODHD300 | LINE6_BIT_PODHD500, 91 + LINE6_BITS_PODHDALL = LINE6_BIT_PODHD300 | 92 + LINE6_BIT_PODHD400 | 93 + LINE6_BIT_PODHD500, 95 94 LINE6_BITS_BASSPODXTALL = LINE6_BIT_BASSPODXT | 96 95 LINE6_BIT_BASSPODXTLIVE | 97 96 LINE6_BIT_BASSPODXTPRO