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

diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 4ff8cbb..f833aa2 100644 (file)
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -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.
 

diff --git a/drivers/phy/phy-miphy365x.c b/drivers/phy/phy-miphy365x.c
index e111baf..e0fb7a1 100644 (file)
--- a/drivers/phy/phy-miphy365x.c
+++ b/drivers/phy/phy-miphy365x.c
@@ -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

diff --cc drivers/usb/host/ehci-hcd.c
Simple merge

diff --cc drivers/usb/storage/unusual_devs.h
Simple merge