---

yaml --- r: 322700 b: refs/heads/master c: 29d2145 h: refs/heads/master v: v3
git-mirror · Sep 4, 2012 · 057ba75 · 057ba75
1 parent 4300042
commit 057ba75
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 57 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92fc7a8b0f20bdb243c706daf42658e8e0cd2ef0
+refs/heads/master: 29d214576f936db627ff62afb9ef438eea18bcd2
diff --git a/trunk/drivers/usb/core/quirks.c b/trunk/drivers/usb/core/quirks.c
@@ -71,10 +71,6 @@ static const struct usb_device_id usb_quirk_list[] = {
 	{ USB_DEVICE(0x04b4, 0x0526), .driver_info =
 			USB_QUIRK_CONFIG_INTF_STRINGS },
 
-	/* Microchip Joss Optical infrared touchboard device */
-	{ USB_DEVICE(0x04d8, 0x000c), .driver_info =
-			USB_QUIRK_CONFIG_INTF_STRINGS },
-
 	/* Samsung Android phone modem - ID conflict with SPH-I500 */
 	{ USB_DEVICE(0x04e8, 0x6601), .driver_info =
 			USB_QUIRK_CONFIG_INTF_STRINGS },

diff --git a/trunk/drivers/usb/host/ohci-at91.c b/trunk/drivers/usb/host/ohci-at91.c
@@ -570,16 +570,6 @@ static int __devinit ohci_hcd_at91_drv_probe(struct platform_device *pdev)
 
 	if (pdata) {
 		at91_for_each_port(i) {
-			/*
-			 * do not configure PIO if not in relation with
-			 * real USB port on board
-			 */
-			if (i >= pdata->ports) {
-				pdata->vbus_pin[i] = -EINVAL;
-				pdata->overcurrent_pin[i] = -EINVAL;
-				break;
-			}
-
 			if (!gpio_is_valid(pdata->vbus_pin[i]))
 				continue;
 			gpio = pdata->vbus_pin[i];

diff --git a/trunk/drivers/usb/host/pci-quirks.c b/trunk/drivers/usb/host/pci-quirks.c
@@ -870,9 +870,10 @@ static void __devinit quirk_usb_handoff_xhci(struct pci_dev *pdev)
 	/* Disable any BIOS SMIs and clear all SMI events*/
 	writel(val, base + ext_cap_offset + XHCI_LEGACY_CONTROL_OFFSET);
 
+hc_init:
 	if (usb_is_intel_switchable_xhci(pdev))
 		usb_enable_xhci_ports(pdev);
-hc_init:
+
 	op_reg_base = base + XHCI_HC_LENGTH(readl(base));
 
 	/* Wait for the host controller to be ready before writing any

diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c
@@ -704,7 +704,6 @@ static struct usb_device_id id_table_combined [] = {
 	{ USB_DEVICE(FTDI_VID, FTDI_PCDJ_DAC2_PID) },
 	{ USB_DEVICE(FTDI_VID, FTDI_RRCIRKITS_LOCOBUFFER_PID) },
 	{ USB_DEVICE(FTDI_VID, FTDI_ASK_RDR400_PID) },
-	{ USB_DEVICE(FTDI_VID, FTDI_NZR_SEM_USB_PID) },
 	{ USB_DEVICE(ICOM_VID, ICOM_ID_1_PID) },
 	{ USB_DEVICE(ICOM_VID, ICOM_OPC_U_UC_PID) },
 	{ USB_DEVICE(ICOM_VID, ICOM_ID_RP2C1_PID) },
@@ -811,24 +810,7 @@ static struct usb_device_id id_table_combined [] = {
 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
 	{ USB_DEVICE(LARSENBRUSGAARD_VID, LB_ALTITRACK_PID) },
 	{ USB_DEVICE(GN_OTOMETRICS_VID, AURICAL_USB_PID) },
-	{ USB_DEVICE(FTDI_VID, PI_C865_PID) },
-	{ USB_DEVICE(FTDI_VID, PI_C857_PID) },
-	{ USB_DEVICE(PI_VID, PI_C866_PID) },
-	{ USB_DEVICE(PI_VID, PI_C663_PID) },
-	{ USB_DEVICE(PI_VID, PI_C725_PID) },
-	{ USB_DEVICE(PI_VID, PI_E517_PID) },
-	{ USB_DEVICE(PI_VID, PI_C863_PID) },
 	{ USB_DEVICE(PI_VID, PI_E861_PID) },
-	{ USB_DEVICE(PI_VID, PI_C867_PID) },
-	{ USB_DEVICE(PI_VID, PI_E609_PID) },
-	{ USB_DEVICE(PI_VID, PI_E709_PID) },
-	{ USB_DEVICE(PI_VID, PI_100F_PID) },
-	{ USB_DEVICE(PI_VID, PI_1011_PID) },
-	{ USB_DEVICE(PI_VID, PI_1012_PID) },
-	{ USB_DEVICE(PI_VID, PI_1013_PID) },
-	{ USB_DEVICE(PI_VID, PI_1014_PID) },
-	{ USB_DEVICE(PI_VID, PI_1015_PID) },
-	{ USB_DEVICE(PI_VID, PI_1016_PID) },
 	{ USB_DEVICE(KONDO_VID, KONDO_USB_SERIAL_PID) },
 	{ USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) },
 	{ USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID),

diff --git a/trunk/drivers/usb/serial/ftdi_sio_ids.h b/trunk/drivers/usb/serial/ftdi_sio_ids.h
@@ -75,9 +75,6 @@
 #define FTDI_OPENDCC_GATEWAY_PID	0xBFDB
 #define FTDI_OPENDCC_GBM_PID	0xBFDC
 
-/* NZR SEM 16+ USB (http://www.nzr.de) */
-#define FTDI_NZR_SEM_USB_PID	0xC1E0	/* NZR SEM-LOG16+ */
-
 /*
  * RR-CirKits LocoBuffer USB (http://www.rr-cirkits.com)
  */
@@ -794,27 +791,8 @@
  * Physik Instrumente
  * http://www.physikinstrumente.com/en/products/
  */
-/* These two devices use the VID of FTDI */
-#define PI_C865_PID	0xe0a0  /* PI C-865 Piezomotor Controller */
-#define PI_C857_PID	0xe0a1  /* PI Encoder Trigger Box */
-
 #define PI_VID              0x1a72  /* Vendor ID */
-#define PI_C866_PID	0x1000  /* PI C-866 Piezomotor Controller */
-#define PI_C663_PID	0x1001  /* PI C-663 Mercury-Step */
-#define PI_C725_PID	0x1002  /* PI C-725 Piezomotor Controller */
-#define PI_E517_PID	0x1005  /* PI E-517 Digital Piezo Controller Operation Module */
-#define PI_C863_PID	0x1007  /* PI C-863 */
-#define PI_E861_PID	0x1008  /* PI E-861 Piezomotor Controller */
-#define PI_C867_PID	0x1009  /* PI C-867 Piezomotor Controller */
-#define PI_E609_PID	0x100D  /* PI E-609 Digital Piezo Controller */
-#define PI_E709_PID	0x100E  /* PI E-709 Digital Piezo Controller */
-#define PI_100F_PID	0x100F  /* PI Digital Piezo Controller */
-#define PI_1011_PID	0x1011  /* PI Digital Piezo Controller */
-#define PI_1012_PID	0x1012  /* PI Motion Controller */
-#define PI_1013_PID	0x1013  /* PI Motion Controller */
-#define PI_1014_PID	0x1014  /* PI Device */
-#define PI_1015_PID	0x1015  /* PI Device */
-#define PI_1016_PID	0x1016  /* PI Digital Servo Module */
+#define PI_E861_PID         0x1008  /* E-861 piezo controller USB connection */
 
 /*
  * Kondo Kagaku Co.Ltd.