Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+35
-2
+2
drivers/phy/Kconfig
+2
drivers/phy/Kconfig
···
214
214
config PHY_ST_SPEAR1310_MIPHY
215
215
tristate "ST SPEAR1310-MIPHY driver"
216
216
select GENERIC_PHY
217
+
depends on MACH_SPEAR1310 || COMPILE_TEST
217
218
help
218
219
Support for ST SPEAr1310 MIPHY which can be used for PCIe and SATA.
219
220
220
221
config PHY_ST_SPEAR1340_MIPHY
221
222
tristate "ST SPEAR1340-MIPHY driver"
222
223
select GENERIC_PHY
224
+
depends on MACH_SPEAR1340 || COMPILE_TEST
223
225
help
224
226
Support for ST SPEAr1340 MIPHY which can be used for PCIe and SATA.
225
227
+1
drivers/phy/phy-miphy365x.c
+1
drivers/phy/phy-miphy365x.c
-2
drivers/usb/host/ehci-hcd.c
-2
drivers/usb/host/ehci-hcd.c
+32
drivers/usb/storage/unusual_devs.h
+32
drivers/usb/storage/unusual_devs.h
···
101
101
"PhotoSmart R707",
102
102
USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_FIX_CAPACITY),
103
103
104
+
UNUSUAL_DEV( 0x03f3, 0x0001, 0x0000, 0x9999,
105
+
"Adaptec",
106
+
"USBConnect 2000",
107
+
USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_euscsi_init,
108
+
US_FL_SCM_MULT_TARG ),
109
+
104
110
/* Reported by Sebastian Kapfer <sebastian_kapfer@gmx.net>
105
111
* and Olaf Hering <olh@suse.de> (different bcd's, same vendor/product)
106
112
* for USB floppies that need the SINGLE_LUN enforcement.
···
1131
1125
USB_SC_DEVICE, USB_PR_DEVICE, NULL,
1132
1126
US_FL_NOT_LOCKABLE),
1133
1127
1128
+
UNUSUAL_DEV( 0x085a, 0x0026, 0x0100, 0x0133,
1129
+
"Xircom",
1130
+
"PortGear USB-SCSI (Mac USB Dock)",
1131
+
USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_euscsi_init,
1132
+
US_FL_SCM_MULT_TARG ),
1133
+
1134
+
UNUSUAL_DEV( 0x085a, 0x0028, 0x0100, 0x0133,
1135
+
"Xircom",
1136
+
"PortGear USB to SCSI Converter",
1137
+
USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_euscsi_init,
1138
+
US_FL_SCM_MULT_TARG ),
1139
+
1134
1140
/* Submitted by Jan De Luyck <lkml@kcore.org> */
1135
1141
UNUSUAL_DEV( 0x08bd, 0x1100, 0x0000, 0x0000,
1136
1142
"CITIZEN",
···
1982
1964
USB_SC_DEVICE, USB_PR_DEVICE, NULL,
1983
1965
US_FL_IGNORE_RESIDUE | US_FL_SANE_SENSE ),
1984
1966
1967
+
/* Entrega Technologies U1-SC25 (later Xircom PortGear PGSCSI)
1968
+
* and Mac USB Dock USB-SCSI */
1969
+
UNUSUAL_DEV( 0x1645, 0x0007, 0x0100, 0x0133,
1970
+
"Entrega Technologies",
1971
+
"USB to SCSI Converter",
1972
+
USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_euscsi_init,
1973
+
US_FL_SCM_MULT_TARG ),
1974
+
1985
1975
/* Reported by Robert Schedel <r.schedel@yahoo.de>
1986
1976
* Note: this is a 'super top' device like the above 14cd/6600 device */
1987
1977
UNUSUAL_DEV( 0x1652, 0x6600, 0x0201, 0x0201,
···
2011
1985
"PMP400",
2012
1986
USB_SC_DEVICE, USB_PR_DEVICE, NULL,
2013
1987
US_FL_BULK_IGNORE_TAG | US_FL_MAX_SECTORS_64 ),
1988
+
1989
+
UNUSUAL_DEV( 0x1822, 0x0001, 0x0000, 0x9999,
1990
+
"Ariston Technologies",
1991
+
"iConnect USB to SCSI adapter",
1992
+
USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_euscsi_init,
1993
+
US_FL_SCM_MULT_TARG ),
2014
1994
2015
1995
/* Reported by Hans de Goede <hdegoede@redhat.com>
2016
1996
* These Appotech controllers are found in Picture Frames, they provide a