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

Commit 90a3c48f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are some USB and PHY fixes for 3.17-rc5.

  Nothing major here, just a number of tiny fixes for reported issues,
  and some new device ids as well.

  All have been tested in linux-next"

* tag 'usb-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (46 commits)
  xhci: fix oops when xhci resumes from hibernate with hw lpm capable devices
  usb: xhci: Fix OOPS in xhci error handling code
  xhci: Fix null pointer dereference if xhci initialization fails
  storage: Add single-LUN quirk for Jaz USB Adapter
  uas: Add missing le16_to_cpu calls to asm1051 / asm1053 usb-id check
  usb: chipidea: msm: Initialize PHY on reset event
  usb: chipidea: msm: Use USB PHY API to control PHY state
  usb: hub: take hub->hdev reference when processing from eventlist
  uas: Disable uas on ASM1051 devices
  usb: dwc2/gadget: avoid disabling ep0
  usb: dwc2/gadget: delay enabling irq once hardware is configured properly
  usb: dwc2/gadget: do not call disconnect method in pullup
  usb: dwc2/gadget: break infinite loop in endpoint disable code
  usb: dwc2/gadget: fix phy initialization sequence
  usb: dwc2/gadget: fix phy disable sequence
  uwb: init beacon cache entry before registering uwb device
  USB: ftdi_sio: Add support for GE Healthcare Nemo Tracker device
  USB: document the 'u' flag for usb-storage quirks parameter
  usb: host: xhci: fix compliance mode workaround
  usb: dwc3: fix TRB completion when multiple TRBs are started
  ...
parents 602b5366 e2c60989

Documentation/devicetree/bindings/usb/mxs-phy.txt

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
	* "fsl,imx23-usbphy" for imx23 and imx28

	* "fsl,imx6q-usbphy" for imx6dq and imx6dl

	* "fsl,imx6sl-usbphy" for imx6sl

	* "fsl,imx6sx-usbphy" for imx6sx

  "fsl,imx23-usbphy" is still a fallback for other strings

- reg: Should contain registers location and length

- interrupts: Should contain phy interrupt

Documentation/kernel-parameters.txt

+1 −0
Original line number Diff line number Diff line
@@ -3541,6 +3541,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
					bogus residue values);

				s = SINGLE_LUN (the device has only one

					Logical Unit);

				u = IGNORE_UAS (don't bind to the uas driver);

				w = NO_WP_DETECT (don't test whether the

					medium is write-protected).

			Example: quirks=0419:aaf5:rl,0421:0433:rc

MAINTAINERS

+13 −0
Original line number Diff line number Diff line
@@ -7913,6 +7913,19 @@ S: Supported 
L:	netdev@vger.kernel.org

F:	drivers/net/ethernet/samsung/sxgbe/



SAMSUNG USB2 PHY DRIVER

M:	Kamil Debski <k.debski@samsung.com>

L:	linux-kernel@vger.kernel.org

S:	Supported

F:	Documentation/devicetree/bindings/phy/samsung-phy.txt

F:	Documentation/phy/samsung-usb2.txt

F:	drivers/phy/phy-exynos4210-usb2.c

F:	drivers/phy/phy-exynos4x12-usb2.c

F:	drivers/phy/phy-exynos5250-usb2.c

F:	drivers/phy/phy-s5pv210-usb2.c

F:	drivers/phy/phy-samsung-usb2.c

F:	drivers/phy/phy-samsung-usb2.h



SERIAL DRIVERS

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

L:	linux-serial@vger.kernel.org

drivers/phy/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ config PHY_MVEBU_SATA 
config PHY_MIPHY365X

	tristate "STMicroelectronics MIPHY365X PHY driver for STiH41x series"

	depends on ARCH_STI

	depends on GENERIC_PHY

	depends on HAS_IOMEM

	depends on OF

	select GENERIC_PHY

	help

	  Enable this to support the miphy transceiver (for SATA/PCIE)

	  that is part of STMicroelectronics STiH41x SoC series.

drivers/phy/phy-exynos5-usbdrd.c

+1 −0
Original line number Diff line number Diff line
@@ -542,6 +542,7 @@ static const struct of_device_id exynos5_usbdrd_phy_of_match[] = { 
	},

	{ },

};

MODULE_DEVICE_TABLE(of, exynos5_usbdrd_phy_of_match);



static int exynos5_usbdrd_phy_probe(struct platform_device *pdev)

{