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

Commit 55b81e6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (232 commits)
  USB: Add USB-ID for Multiplex RC serial adapter to cp210x.c
  xhci: Clean up 32-bit build warnings.
  USB: update documentation for usbmon
  usb: usb-storage doesn't support dynamic id currently, the patch disables the feature to fix an oops
  drivers/usb/class/cdc-acm.c: clear dangling pointer
  drivers/usb/dwc3/dwc3-pci.c: introduce missing kfree
  drivers/usb/host/isp1760-if.c: introduce missing kfree
  usb: option: add ZD Incorporated HSPA modem
  usb: ch9: fix up MaxStreams helper
  USB: usb-skeleton.c: cleanup open_count
  USB: usb-skeleton.c: fix open/disconnect race
  xhci: Properly handle COMP_2ND_BW_ERR
  USB: remove dead code from suspend/resume path
  USB: add quirk for another camera
  drivers: usb: wusbcore: Fix dependency for USB_WUSB
  xhci: Better debugging for critical host errors.
  xhci: Be less verbose during URB cancellation.
  xhci: Remove debugging about ring structure allocation.
  xhci: Remove debugging about toggling cycle bits.
  xhci: Remove debugging for individual transfers.
  ...
parents 5983faf9 08e87d0d

Documentation/ABI/testing/sysfs-bus-usb

+25 −0
Original line number Diff line number Diff line
@@ -119,6 +119,31 @@ Description: 
		Write a 1 to force the device to disconnect

		(equivalent to unplugging a wired USB device).



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

Date:		October 2011

Contact:	linux-usb@vger.kernel.org

Description:

		Writing a device ID to this file will attempt to

		dynamically add a new device ID to a USB device driver.

		This may allow the driver to support more hardware than

		was included in the driver's static device ID support

		table at compile time. The format for the device ID is:

		idVendor idProduct bInterfaceClass.

		The vendor ID and device ID fields are required, the

		interface class is optional.

		Upon successfully adding an ID, the driver will probe

		for the device and attempt to bind to it.  For example:

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



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

Date:		October 2011

Contact:	linux-usb@vger.kernel.org

Description:

		For serial USB drivers, this attribute appears under the

		extra bus folder "usb-serial" in sysfs; apart from that

		difference, all descriptions from the entry

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



What:		/sys/bus/usb/drivers/.../remove_id

Date:		November 2009

Contact:	CHENG Renquan <rqcheng@smu.edu.sg>

Documentation/feature-removal-schedule.txt

+14 −0
Original line number Diff line number Diff line
@@ -523,6 +523,20 @@ Why: In 3.0, we can now autodetect internal 3G device and already have 
	information log when acer-wmi initial.

Who:    Lee, Chun-Yi <jlee@novell.com>



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



What:	/sys/devices/platform/_UDC_/udc/_UDC_/is_dualspeed file and

	is_dualspeed line in /sys/devices/platform/ci13xxx_*/udc/device file.

When:	3.8

Why:	The is_dualspeed file is superseded by maximum_speed in the same

	directory and is_dualspeed line in device file is superseded by

	max_speed line in the same file.



	The maximum_speed/max_speed specifies maximum speed supported by UDC.

	To check if dualspeeed is supported, check if the value is >= 3.

	Various possible speeds are defined in <linux/usb/ch9.h>.

Who:	Michal Nazarewicz <mina86@mina86.com>



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



What:	The XFS nodelaylog mount option

Documentation/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -2637,6 +2637,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			[USB] Start with the old device initialization

			scheme (default 0 = off).



	usbcore.usbfs_memory_mb=

			[USB] Memory limit (in MB) for buffers allocated by

			usbfs (default = 16, 0 = max = 2047).



	usbcore.use_both_schemes=

			[USB] Try the other device initialization scheme

			if the first one fails (default 1 = enabled).

Documentation/usb/usbmon.txt

+9 −5
Original line number Diff line number Diff line
@@ -47,10 +47,11 @@ This allows to filter away annoying devices that talk continuously. 


2. Find which bus connects to the desired device



Run "cat /proc/bus/usb/devices", and find the T-line which corresponds to

the device. Usually you do it by looking for the vendor string. If you have

many similar devices, unplug one and compare two /proc/bus/usb/devices outputs.

The T-line will have a bus number. Example:

Run "cat /sys/kernel/debug/usb/devices", and find the T-line which corresponds

to the device. Usually you do it by looking for the vendor string. If you have

many similar devices, unplug one and compare the two

/sys/kernel/debug/usb/devices outputs. The T-line will have a bus number.

Example:



T:  Bus=03 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#=  2 Spd=12  MxCh= 0

D:  Ver= 1.10 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs=  1
@@ -58,7 +59,10 @@ P: Vendor=0557 ProdID=2004 Rev= 1.00 
S:  Manufacturer=ATEN

S:  Product=UC100KM V2.00



Bus=03 means it's bus 3.

"Bus=03" means it's bus 3. Alternatively, you can look at the output from

"lsusb" and get the bus number from the appropriate line. Example:



Bus 003 Device 002: ID 0557:2004 ATEN UC100KM V2.00



3. Start 'cat'

arch/arm/mach-omap2/board-n8x0.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static struct device *mmc_device; 
#define TUSB6010_GPIO_ENABLE	0

#define TUSB6010_DMACHAN	0x3f



#ifdef CONFIG_USB_MUSB_TUSB6010

#if defined(CONFIG_USB_MUSB_TUSB6010) || defined(CONFIG_USB_MUSB_TUSB6010_MODULE)

/*

 * Enable or disable power to TUSB6010. When enabling, turn on 3.3 V and

 * 1.5 V voltage regulators of PM companion chip. Companion chip will then