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

Commit c1fb79e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB fixes / quirks from Greg KH:
 "Here are some USB and PHY fixes and quirks for 3.17-rc6.  Nothing
  major, just a few things that have been reported"

* tag 'usb-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: storage: Add quirks for Entrega/Xircom USB to SCSI converters
  USB: storage: Add quirk for Ariston Technologies iConnect USB to SCSI adapter
  USB: storage: Add quirk for Adaptec USBConnect 2000 USB-to-SCSI Adapter
  USB: EHCI: unlink QHs even after the controller has stopped
  phy: spear1340-miphy: fix driver dependencies
  phy: spear1310-miphy: fix driver dependencies
  phy: miphy365x: Fix off-by-one error
parents 0d951433 c80b4495

drivers/phy/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -214,12 +214,14 @@ config PHY_QCOM_IPQ806X_SATA 
config PHY_ST_SPEAR1310_MIPHY

	tristate "ST SPEAR1310-MIPHY driver"

	select GENERIC_PHY

	depends on MACH_SPEAR1310 || COMPILE_TEST

	help

	  Support for ST SPEAr1310 MIPHY which can be used for PCIe and SATA.



config PHY_ST_SPEAR1340_MIPHY

	tristate "ST SPEAR1340-MIPHY driver"

	select GENERIC_PHY

	depends on MACH_SPEAR1340 || COMPILE_TEST

	help

	  Support for ST SPEAr1340 MIPHY which can be used for PCIe and SATA.

drivers/phy/phy-miphy365x.c

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ enum miphy_sata_gen { 
};



static u8 rx_tx_spd[] = {

	0, /* GEN0 doesn't exist. */

	TX_SPDSEL_GEN1_VAL | RX_SPDSEL_GEN1_VAL,

	TX_SPDSEL_GEN2_VAL | RX_SPDSEL_GEN2_VAL,

	TX_SPDSEL_GEN3_VAL | RX_SPDSEL_GEN3_VAL

drivers/usb/host/ehci-hcd.c

+0 −2
Original line number Diff line number Diff line
@@ -965,8 +965,6 @@ ehci_endpoint_disable (struct usb_hcd *hcd, struct usb_host_endpoint *ep) 
	}



	qh->exception = 1;

	if (ehci->rh_state < EHCI_RH_RUNNING)

		qh->qh_state = QH_STATE_IDLE;

	switch (qh->qh_state) {

	case QH_STATE_LINKED:

		WARN_ON(!list_empty(&qh->qtd_list));

drivers/usb/storage/unusual_devs.h

+32 −0
Original line number Diff line number Diff line
@@ -101,6 +101,12 @@ UNUSUAL_DEV( 0x03f0, 0x4002, 0x0001, 0x0001, 
		"PhotoSmart R707",

		USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_FIX_CAPACITY),



UNUSUAL_DEV(  0x03f3, 0x0001, 0x0000, 0x9999,

		"Adaptec",

		"USBConnect 2000",

		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_euscsi_init,

		US_FL_SCM_MULT_TARG ),



/* Reported by Sebastian Kapfer <sebastian_kapfer@gmx.net>

 * and Olaf Hering <olh@suse.de> (different bcd's, same vendor/product)

 * for USB floppies that need the SINGLE_LUN enforcement.
@@ -1125,6 +1131,18 @@ UNUSUAL_DEV( 0x0851, 0x1543, 0x0200, 0x0200, 
		USB_SC_DEVICE, USB_PR_DEVICE, NULL,

		US_FL_NOT_LOCKABLE),



UNUSUAL_DEV(  0x085a, 0x0026, 0x0100, 0x0133,

		"Xircom",

		"PortGear USB-SCSI (Mac USB Dock)",

		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_euscsi_init,

		US_FL_SCM_MULT_TARG ),



UNUSUAL_DEV(  0x085a, 0x0028, 0x0100, 0x0133,

		"Xircom",

		"PortGear USB to SCSI Converter",

		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_euscsi_init,

		US_FL_SCM_MULT_TARG ),



/* Submitted by Jan De Luyck <lkml@kcore.org> */

UNUSUAL_DEV(  0x08bd, 0x1100, 0x0000, 0x0000,

		"CITIZEN",
@@ -1964,6 +1982,14 @@ UNUSUAL_DEV( 0x152d, 0x2329, 0x0100, 0x0100, 
		USB_SC_DEVICE, USB_PR_DEVICE, NULL,

		US_FL_IGNORE_RESIDUE | US_FL_SANE_SENSE ),



/* Entrega Technologies U1-SC25 (later Xircom PortGear PGSCSI)

 * and Mac USB Dock USB-SCSI */

UNUSUAL_DEV(  0x1645, 0x0007, 0x0100, 0x0133,

		"Entrega Technologies",

		"USB to SCSI Converter",

		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_euscsi_init,

		US_FL_SCM_MULT_TARG ),



/* Reported by Robert Schedel <r.schedel@yahoo.de>

 * Note: this is a 'super top' device like the above 14cd/6600 device */

UNUSUAL_DEV(  0x1652, 0x6600, 0x0201, 0x0201,
@@ -1986,6 +2012,12 @@ UNUSUAL_DEV( 0x177f, 0x0400, 0x0000, 0x0000, 
		USB_SC_DEVICE, USB_PR_DEVICE, NULL,

		US_FL_BULK_IGNORE_TAG | US_FL_MAX_SECTORS_64 ),



UNUSUAL_DEV(  0x1822, 0x0001, 0x0000, 0x9999,

		"Ariston Technologies",

		"iConnect USB to SCSI adapter",

		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_euscsi_init,

		US_FL_SCM_MULT_TARG ),



/* Reported by Hans de Goede <hdegoede@redhat.com>

 * These Appotech controllers are found in Picture Frames, they provide a

 * (buggy) emulation of a cdrom drive which contains the windows software