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

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



Pull USB changes from Greg Kroah-Hartman:
 "Here is the big USB pull request for 3.7-rc1

  There are lots of gadget driver changes (including copying a bunch of
  files into the drivers/staging/ccg/ directory so that the other gadget
  drivers can be fixed up properly without breaking that driver), and we
  remove the old obsolete ub.c driver from the tree.

  There are also the usual XHCI set of updates, and other various driver
  changes and updates.  We also are trying hard to remove the old dbg()
  macro, but the final bits of that removal will be coming in through
  the networking tree before we can delete it for good.

  All of these patches have been in the linux-next tree.

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

Fix up several annoying - but fairly mindless - conflicts due to the
termios structure having moved into the tty device, and often clashing
with dbg -> dev_dbg conversion.

* tag 'usb-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (339 commits)
  USB: ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc
  USB: uas: fix gcc warning
  USB: uas: fix locking
  USB: Fix race condition when removing host controllers
  USB: uas: add locking
  USB: uas: fix abort
  USB: uas: remove aborted field, replace with status bit.
  USB: uas: fix task management
  USB: uas: keep track of command urbs
  xhci: Intel Panther Point BEI quirk.
  powerpc/usb: remove checking PHY_CLK_VALID for UTMI PHY
  USB: ftdi_sio: add TIAO USB Multi-Protocol Adapter (TUMPA) support
  Revert "usb : Add sysfs files to control port power."
  USB: serial: remove vizzini driver
  usb: host: xhci: Fix Null pointer dereferencing with 71c731a2 for non-x86 systems
  Increase XHCI suspend timeout to 16ms
  USB: ohci-at91: fix null pointer in ohci_hcd_at91_overcurrent_irq
  USB: sierra_ms: don't keep unused variable
  fsl/usb: Add support for USB controller version 2.4
  USB: qcaux: add Pantech vendor class match
  ...
parents 3498d13b 70c048a2

Documentation/ABI/testing/sysfs-bus-usb

+7 −0
Original line number Diff line number Diff line
@@ -220,3 +220,10 @@ Description: 
		If the device doesn't support LTM, the file will read "no".

		The file will be present for all speeds of USB devices, and will

		always read "no" for USB 1.1 and USB 2.0 devices.



What:		/sys/bus/usb/devices/.../(hub interface)/portX

Date:		August 2012

Contact:	Lan Tianyu <tianyu.lan@intel.com>

Description:

		The /sys/bus/usb/devices/.../(hub interface)/portX

		is usb port device's sysfs directory.

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

0 → 100644
+14 −0
Original line number Diff line number Diff line 
AM33XX MUSB GLUE

 - compatible : Should be "ti,musb-am33xx"

 - ti,hwmods : must be "usb_otg_hs"

 - multipoint : Should be "1" indicating the musb controller supports

   multipoint. This is a MUSB configuration-specific setting.

 - num_eps : Specifies the number of endpoints. This is also a

   MUSB configuration-specific setting. Should be set to "16"

 - ram_bits : Specifies the ram address size. Should be set to "12"

 - port0_mode : Should be "3" to represent OTG. "1" signifies HOST and "2"

   represents PERIPHERAL.

 - port1_mode : Should be "1" to represent HOST. "3" signifies OTG and "2"

   represents PERIPHERAL.

 - power : Should be "250". This signifies the controller can supply upto

   500mA when operating in host mode.

Documentation/devicetree/bindings/usb/ci13xxx-imx.txt

+5 −0
Original line number Diff line number Diff line
@@ -7,7 +7,10 @@ Required properties: 


Optional properties:

- fsl,usbphy: phandler of usb phy that connects to the only one port

- fsl,usbmisc: phandler of non-core register device, with one argument

  that indicate usb controller index

- vbus-supply: regulator for vbus

- disable-over-current: disable over current detect



Examples:

usb@02184000 { /* USB OTG */
@@ -15,4 +18,6 @@ usb@02184000 { /* USB OTG */ 
	reg = <0x02184000 0x200>;

	interrupts = <0 43 0x04>;

	fsl,usbphy = <&usbphy1>;

	fsl,usbmisc = <&usbmisc 0>;

	disable-over-current;

};

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

0 → 100644
+33 −0
Original line number Diff line number Diff line 
OMAP GLUE



OMAP MUSB GLUE

 - compatible : Should be "ti,omap4-musb" or "ti,omap3-musb"

 - ti,hwmods : must be "usb_otg_hs"

 - multipoint : Should be "1" indicating the musb controller supports

   multipoint. This is a MUSB configuration-specific setting.

 - num_eps : Specifies the number of endpoints. This is also a

   MUSB configuration-specific setting. Should be set to "16"

 - ram_bits : Specifies the ram address size. Should be set to "12"

 - interface_type : This is a board specific setting to describe the type of

   interface between the controller and the phy. It should be "0" or "1"

   specifying ULPI and UTMI respectively.

 - mode : Should be "3" to represent OTG. "1" signifies HOST and "2"

   represents PERIPHERAL.

 - power : Should be "50". This signifies the controller can supply upto

   100mA when operating in host mode.



SOC specific device node entry

usb_otg_hs: usb_otg_hs@4a0ab000 {

	compatible = "ti,omap4-musb";

	ti,hwmods = "usb_otg_hs";

	multipoint = <1>;

	num_eps = <16>;

	ram_bits = <12>;

};



Board specific device node entry

&usb_otg_hs {

	interface_type = <1>;

	mode = <3>;

	power = <50>;

};

Documentation/devicetree/bindings/usb/platform-uhci.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
Generic Platform UHCI controllers.



Required properties:

 - compatible: Should be "platform-uhci".

 - reg: Address range of the uhci registers

 - interrupts: Should contain the uhci interrupt.



usb: uhci@D8007301 {

	compatible = "platform-uhci", "usb-uhci";

	reg = <0xD8007301 0x200>;

	interrupts = <0>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE