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

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

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



Pull USB 3.5-rc1 changes from Greg Kroah-Hartman:
 "Here is the big USB 3.5-rc1 pull request for the 3.5-rc1 merge window.

  It's touches a lot of different parts of the kernel, all USB drivers,
  due to some API cleanups (getting rid of the ancient err() macro) and
  some changes that are needed for USB 3.0 power management updates.

  There are also lots of new drivers, pimarily gadget, but others as
  well.  We deleted a staging driver, which was nice, and finally
  dropped the obsolete usbfs code, which will make Al happy to never
  have to touch that again.

  There were some build errors in the tree that linux-next found a few
  days ago, but those were fixed by the most recent changes (all were
  due to us not building with CONFIG_PM disabled.)

  Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">

* tag 'usb-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (477 commits)
  xhci: Fix DIV_ROUND_UP compile error.
  xhci: Fix compile with CONFIG_USB_SUSPEND=n
  USB: Fix core compile with CONFIG_USB_SUSPEND=n
  brcm80211: Fix compile error for .disable_hub_initiated_lpm.
  Revert "USB: EHCI: work around bug in the Philips ISP1562 controller"
  MAINTAINERS: Add myself as maintainer to the USB PHY Layer
  USB: EHCI: fix command register configuration lost problem
  USB: Remove races in devio.c
  USB: ehci-platform: remove update_device
  USB: Disable hub-initiated LPM for comms devices.
  xhci: Add Intel U1/U2 timeout policy.
  xhci: Add infrastructure for host-specific LPM policies.
  USB: Add macros for interrupt endpoint types.
  xhci: Reserve one command for USB3 LPM disable.
  xhci: Some Evaluate Context commands must succeed.
  USB: Disable USB 3.0 LPM in critical sections.
  USB: Add support to enable/disable USB3 link states.
  USB: Allow drivers to disable hub-initiated LPM.
  USB: Calculate USB 3.0 exit latencies for LPM.
  USB: Refactor code to set LPM support flag.
  ...

Conflicts:
	arch/arm/mach-exynos/mach-nuri.c
	arch/arm/mach-exynos/mach-universal_c210.c
	drivers/net/wireless/ath/ath6kl/usb.c
parents f6a26ae7 cda4db53

Documentation/ABI/testing/sysfs-bus-usb

+15 −0
Original line number Diff line number Diff line
@@ -135,6 +135,17 @@ Description: 
		for the device and attempt to bind to it.  For example:

		# echo "8086 10f5" > /sys/bus/usb/drivers/foo/new_id



		Reading from this file will list all dynamically added

		device IDs in the same format, with one entry per

		line. For example:

		# cat /sys/bus/usb/drivers/foo/new_id

		8086 10f5

		dead beef 06

		f00d cafe



		The list will be truncated at PAGE_SIZE bytes due to

		sysfs restrictions.



What:		/sys/bus/usb-serial/drivers/.../new_id

Date:		October 2011

Contact:	linux-usb@vger.kernel.org
@@ -157,6 +168,10 @@ Description: 
		match the driver to the device.  For example:

		# echo "046d c315" > /sys/bus/usb/drivers/foo/remove_id



		Reading from this file will list the dynamically added

		device IDs, exactly like reading from the entry

		"/sys/bus/usb/drivers/.../new_id"



What:		/sys/bus/usb/device/.../avoid_reset_quirk

Date:		December 2009

Contact:	Oliver Neukum <oliver@neukum.org>

Documentation/devicetree/bindings/usb/isp1301.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
* NXP ISP1301 USB transceiver



Required properties:

- compatible: must be "nxp,isp1301"

- reg: I2C address of the ISP1301 device



Optional properties of devices using ISP1301:

- transceiver: phandle of isp1301 - this helps the ISP1301 driver to find the

               ISP1301 instance associated with the respective USB driver



Example:



	isp1301: usb-transceiver@2c {

		compatible = "nxp,isp1301";

		reg = <0x2c>;

	};



	usbd@31020000 {

		compatible = "nxp,lpc3220-udc";

		reg = <0x31020000 0x300>;

		interrupt-parent = <&mic>;

		interrupts = <0x3d 0>, <0x3e 0>, <0x3c 0>, <0x3a 0>;

		transceiver = <&isp1301>;

		status = "okay";

	};

Documentation/devicetree/bindings/usb/lpc32xx-udc.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
* NXP LPC32xx SoC USB Device Controller (UDC)



Required properties:

- compatible: Must be "nxp,lpc3220-udc"

- reg: Physical base address of the controller and length of memory mapped

  region.

- interrupts: The USB interrupts:

              * USB Device Low Priority Interrupt

              * USB Device High Priority Interrupt

              * USB Device DMA Interrupt

              * External USB Transceiver Interrupt (OTG ATX)

- transceiver: phandle of the associated ISP1301 device - this is necessary for

               the UDC controller for connecting to the USB physical layer



Example:



	isp1301: usb-transceiver@2c {

		compatible = "nxp,isp1301";

		reg = <0x2c>;

	};



	usbd@31020000 {

		compatible = "nxp,lpc3220-udc";

		reg = <0x31020000 0x300>;

		interrupt-parent = <&mic>;

		interrupts = <0x3d 0>, <0x3e 0>, <0x3c 0>, <0x3a 0>;

		transceiver = <&isp1301>;

	};

Documentation/devicetree/bindings/usb/ohci-nxp.txt

0 → 100644
+24 −0
Original line number Diff line number Diff line 
* OHCI controller, NXP ohci-nxp variant



Required properties:

- compatible: must be "nxp,ohci-nxp"

- reg: physical base address of the controller and length of memory mapped

  region.

- interrupts: The OHCI interrupt

- transceiver: phandle of the associated ISP1301 device - this is necessary for

               the UDC controller for connecting to the USB physical layer



Example (LPC32xx):



	isp1301: usb-transceiver@2c {

		compatible = "nxp,isp1301";

		reg = <0x2c>;

	};



	ohci@31020000 {

		compatible = "nxp,ohci-nxp";

		reg = <0x31020000 0x300>;

		interrupt-parent = <&mic>;

		interrupts = <0x3b 0>;

		transceiver = <&isp1301>;

	};

Documentation/devicetree/bindings/usb/spear-usb.txt

0 → 100644
+39 −0
Original line number Diff line number Diff line 
ST SPEAr SoC USB controllers:

-----------------------------



EHCI:

-----



Required properties:

- compatible: "st,spear600-ehci"

- interrupt-parent: Should be the phandle for the interrupt controller

  that services interrupts for this device

- interrupts: Should contain the EHCI interrupt



Example:



	ehci@e1800000 {

		compatible = "st,spear600-ehci", "usb-ehci";

		reg = <0xe1800000 0x1000>;

		interrupt-parent = <&vic1>;

		interrupts = <27>;

	};





OHCI:

-----



Required properties:

- compatible: "st,spear600-ohci"

- interrupt-parent: Should be the phandle for the interrupt controller

  that services interrupts for this device

- interrupts: Should contain the OHCI interrupt



Example:



	ohci@e1900000 {

		compatible = "st,spear600-ohci", "usb-ohci";

		reg = <0xe1800000 0x1000>;

		interrupt-parent = <&vic1>;

		interrupts = <26>;

	};