Commit 5cc10350 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (141 commits)
  USB: mct_u232: fix broken close
  USB: gadget: amd5536udc.c: fix error path
  USB: imx21-hcd - fix off by one resource size calculation
  usb: gadget: fix Kconfig warning
  usb: r8a66597-udc: Add processing when USB was removed.
  mxc_udc: add workaround for ENGcm09152 for i.MX35
  USB: ftdi_sio: add device ids for ScienceScope
  USB: musb: AM35x: Workaround for fifo read issue
  USB: musb: add musb support for AM35x
  USB: AM35x: Add musb support
  usb: Fix linker errors with CONFIG_PM=n
  USB: ohci-sh - use resource_size instead of defining its own resource_len macro
  USB: isp1362-hcd - use resource_size instead of defining its own resource_len macro
  USB: isp116x-hcd - use resource_size instead of defining its own resource_len macro
  USB: xhci: Fix compile error when CONFIG_PM=n
  USB: accept some invalid ep0-maxpacket values
  USB: xHCI: PCI power management implementation
  USB: xHCI: bus power management implementation
  USB: xHCI: port remote wakeup implementation
  USB: xHCI: port power management implementation
  ...

Manually fix up (non-data) conflict: the SCSI merge gad renamed the
'hw_sector_size' member to 'physical_block_size', and the USB tree
brought a new use of it.
parents 73ecf3a6 92ca0dc5

Documentation/devices.txt

+4 −1
Original line number Diff line number Diff line
@@ -2554,7 +2554,10 @@ Your cooperation is appreciated. 
		175 = /dev/usb/legousbtower15	16th USB Legotower device

		176 = /dev/usb/usbtmc1	First USB TMC device

		   ...

		192 = /dev/usb/usbtmc16	16th USB TMC device

		191 = /dev/usb/usbtmc16	16th USB TMC device

		192 = /dev/usb/yurex1	First USB Yurex device

		   ...

		209 = /dev/usb/yurex16	16th USB Yurex device

		240 = /dev/usb/dabusb0	First daubusb device

		    ...

		243 = /dev/usb/dabusb3	Fourth dabusb device

Documentation/powerpc/dts-bindings/fsl/usb.txt

+22 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ and additions : 
Required properties :

 - compatible : Should be "fsl-usb2-mph" for multi port host USB

   controllers, or "fsl-usb2-dr" for dual role USB controllers

   or "fsl,mpc5121-usb2-dr" for dual role USB controllers of MPC5121

 - phy_type : For multi port host USB controllers, should be one of

   "ulpi", or "serial". For dual role USB controllers, should be

   one of "ulpi", "utmi", "utmi_wide", or "serial".
@@ -33,6 +34,12 @@ Recommended properties : 
 - interrupt-parent : the phandle for the interrupt controller that

   services interrupts for this device.



Optional properties :

 - fsl,invert-drvvbus : boolean; for MPC5121 USB0 only. Indicates the

   port power polarity of internal PHY signal DRVVBUS is inverted.

 - fsl,invert-pwr-fault : boolean; for MPC5121 USB0 only. Indicates

   the PWR_FAULT signal polarity is inverted.



Example multi port host USB controller device node :

	usb@22000 {

		compatible = "fsl-usb2-mph";
@@ -57,3 +64,18 @@ Example dual role USB controller device node : 
		dr_mode = "otg";

		phy = "ulpi";

	};



Example dual role USB controller device node for MPC5121ADS:



	usb@4000 {

		compatible = "fsl,mpc5121-usb2-dr";

		reg = <0x4000 0x1000>;

		#address-cells = <1>;

		#size-cells = <0>;

		interrupt-parent = < &ipic >;

		interrupts = <44 0x8>;

		dr_mode = "otg";

		phy_type = "utmi_wide";

		fsl,invert-drvvbus;

		fsl,invert-pwr-fault;

	};

Documentation/usb/proc_usb_info.txt

+22 −12
Original line number Diff line number Diff line 
/proc/bus/usb filesystem output

===============================

(version 2003.05.30)

(version 2010.09.13)





The usbfs filesystem for USB devices is traditionally mounted at

/proc/bus/usb.  It provides the /proc/bus/usb/devices file, as well as

the /proc/bus/usb/BBB/DDD files.



In many modern systems the usbfs filsystem isn't used at all.  Instead

USB device nodes are created under /dev/usb/ or someplace similar.  The

"devices" file is available in debugfs, typically as

/sys/kernel/debug/usb/devices.





**NOTE**: If /proc/bus/usb appears empty, and a host controller

	  driver has been linked, then you need to mount the
@@ -106,7 +111,7 @@ Legend: 


Topology info:



T:  Bus=dd Lev=dd Prnt=dd Port=dd Cnt=dd Dev#=ddd Spd=ddd MxCh=dd

T:  Bus=dd Lev=dd Prnt=dd Port=dd Cnt=dd Dev#=ddd Spd=dddd MxCh=dd

|   |      |      |       |       |      |        |        |__MaxChildren

|   |      |      |       |       |      |        |__Device Speed in Mbps

|   |      |      |       |       |      |__DeviceNumber
@@ -120,8 +125,13 @@ T: Bus=dd Lev=dd Prnt=dd Port=dd Cnt=dd Dev#=ddd Spd=ddd MxCh=dd 
    Speed may be:

    	1.5	Mbit/s for low speed USB

	12	Mbit/s for full speed USB

	480	Mbit/s for high speed USB (added for USB 2.0)

	480	Mbit/s for high speed USB (added for USB 2.0);

		  also used for Wireless USB, which has no fixed speed

	5000	Mbit/s for SuperSpeed USB (added for USB 3.0)



    For reasons lost in the mists of time, the Port number is always

    too low by 1.  For example, a device plugged into port 4 will

    show up with "Port=03".



Bandwidth info:

B:  Alloc=ddd/ddd us (xx%), #Int=ddd, #Iso=ddd

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -5973,6 +5973,14 @@ S: Maintained 
F:	Documentation/usb/acm.txt

F:	drivers/usb/class/cdc-acm.*



USB ATTACHED SCSI

M:	Matthew Wilcox <willy@linux.intel.com>

M:	Sarah Sharp <sarah.a.sharp@linux.intel.com>

L:	linux-usb@vger.kernel.org

L:	linux-scsi@vger.kernel.org

S:	Supported

F:	drivers/usb/storage/uas.c



USB BLOCK DRIVER (UB ub)

M:	Pete Zaitcev <zaitcev@redhat.com>

L:	linux-usb@vger.kernel.org

arch/arm/mach-mx3/mach-cpuimx35.c

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ static struct mxc_usbh_platform_data __maybe_unused usbh1_pdata = { 
static struct fsl_usb2_platform_data otg_device_pdata = {

	.operating_mode	= FSL_USB2_DR_DEVICE,

	.phy_mode	= FSL_USB2_PHY_UTMI,

	.workaround	= FLS_USB2_WORKAROUND_ENGCM09152,

};



static int otg_mode_host;

CRA Git | Maintained and supported by SUSTech CRA and CCSE