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

Commit 5eea7ee2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  usbtouchscreen: fix ITM data reading
  USB: New device ID for ftdi_sio usb serial driver
  USB: Support for USB20SVGA-WH & USB20SVGA-DG
  USB: hid-core.c: fix duplicate USB_DEVICE_ID_GTCO_404
parents e004876c 09494d5d

drivers/usb/input/hid-core.c

+2 −2
Original line number Diff line number Diff line
@@ -1444,7 +1444,7 @@ void hid_init_reports(struct hid_device *hid) 
#define USB_DEVICE_ID_GTCO_402		0x0402

#define USB_DEVICE_ID_GTCO_403		0x0403

#define USB_DEVICE_ID_GTCO_404		0x0404

#define USB_DEVICE_ID_GTCO_404		0x0405

#define USB_DEVICE_ID_GTCO_405		0x0405

#define USB_DEVICE_ID_GTCO_500		0x0500

#define USB_DEVICE_ID_GTCO_501		0x0501

#define USB_DEVICE_ID_GTCO_502		0x0502
@@ -1657,7 +1657,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_402, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_403, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_404, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_404, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_405, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_500, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_501, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_502, HID_QUIRK_IGNORE },

drivers/usb/input/usbtouchscreen.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static int mtouch_init(struct usbtouch_usb *usbtouch) 
static int itm_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *press)

{

	*x = ((pkt[0] & 0x1F) << 7) | (pkt[3] & 0x7F);

	*x = ((pkt[1] & 0x1F) << 7) | (pkt[4] & 0x7F);

	*y = ((pkt[1] & 0x1F) << 7) | (pkt[4] & 0x7F);

	*press = ((pkt[2] & 0x1F) << 7) | (pkt[5] & 0x7F);

	*touch = ~pkt[7] & 0x20;

drivers/usb/misc/sisusbvga/sisusb.c

+2 −0
Original line number Diff line number Diff line
@@ -3435,6 +3435,8 @@ static void sisusb_disconnect(struct usb_interface *intf) 


static struct usb_device_id sisusb_table [] = {

	{ USB_DEVICE(0x0711, 0x0900) },

	{ USB_DEVICE(0x0711, 0x0901) },

	{ USB_DEVICE(0x0711, 0x0902) },

	{ USB_DEVICE(0x182d, 0x021c) },

	{ USB_DEVICE(0x182d, 0x0269) },

	{ }

drivers/usb/serial/ftdi_sio.c

+1 −0
Original line number Diff line number Diff line
@@ -506,6 +506,7 @@ static struct usb_device_id id_table_combined [] = { 
	{ USB_DEVICE(FTDI_VID, FTDI_YEI_SERVOCENTER31_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_THORLABS_PID) },

	{ USB_DEVICE(TESTO_VID, TESTO_USB_INTERFACE_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_GAMMA_SCOUT_PID) },

	{ },					/* Optional parameter entry */

	{ }					/* Terminating entry */

};

drivers/usb/serial/ftdi_sio.h

+5 −0
Original line number Diff line number Diff line
@@ -467,6 +467,11 @@ 
#define TESTO_VID			0x128D

#define TESTO_USB_INTERFACE_PID		0x0001



/*

 * Gamma Scout (http://gamma-scout.com/). Submitted by rsc@runtux.com.

 */

#define FTDI_GAMMA_SCOUT_PID		0xD678	/* Gamma Scout online */



/* Commands */

#define FTDI_SIO_RESET 		0 /* Reset the port */

#define FTDI_SIO_MODEM_CTRL 	1 /* Set the modem control register */