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

Commit f549953c 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-2.6 

* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (115 commits)
  EHCI: fix direction handling for interrupt data toggles
  USB: serial: add IDs for WinChipHead USB->RS232 adapter
  USB: OHCI: fix another regression for NVIDIA controllers
  usb: gadget: m66592-udc: add pullup function
  usb: gadget: m66592-udc: add function for external controller
  usb: gadget: r8a66597-udc: add pullup function
  usb: renesas_usbhs: support multi driver
  usb: renesas_usbhs: inaccessible pipe is not an error
  usb: renesas_usbhs: care buff alignment when dma handler
  USB: PL2303: correctly handle baudrates above 115200
  usb: r8a66597-hcd: fixup USB_PORT_STAT_C_SUSPEND shift
  usb: renesas_usbhs: compile/config are rescued
  usb: renesas_usbhs: fixup comment-out
  usb: update email address in ohci-sh and r8a66597-hcd
  usb: r8a66597-hcd: add function for external controller
  EHCI: only power off port if over-current is active
  USB: mon: Allow to use usbmon without debugfs
  USB: EHCI: go back to using the system clock for QH unlinks
  ehci: add pci quirk for Ordissimo and RM Slate 100 too
  ehci: refactor pci quirk to use standard dmi_check_system method
  ...

Fix up trivial conflicts in Documentation/feature-removal-schedule.txt
parents f0deb97a e04f5f7e

Documentation/ABI/testing/sysfs-module

+23 −0
Original line number Diff line number Diff line
@@ -10,3 +10,26 @@ KernelVersion: 2.6.35 
Contact:	masa-korg@dsn.okisemi.com

Description:	Write/read Option ROM data.





What:		/sys/module/ehci_hcd/drivers/.../uframe_periodic_max

Date:		July 2011

KernelVersion:	3.1

Contact:	Kirill Smelkov <kirr@mns.spb.ru>

Description:	Maximum time allowed for periodic transfers per microframe (μs)



		[ USB 2.0 sets maximum allowed time for periodic transfers per

		  microframe to be 80%, that is 100 microseconds out of 125

		  microseconds (full microframe).



		  However there are cases, when 80% max isochronous bandwidth is

		  too limiting. For example two video streams could require 110

		  microseconds of isochronous bandwidth per microframe to work

		  together. ]



		Through this setting it is possible to raise the limit so that

		the host controller would allow allocating more than 100

		microseconds of periodic bandwidth per microframe.



		Beware, non-standard modes are usually not thoroughly tested by

		hardware designers, and the hardware can malfunction when this

		setting differ from default 100.

Documentation/feature-removal-schedule.txt

+7 −0
Original line number Diff line number Diff line
@@ -569,3 +569,10 @@ Why: Just opening a V4L device should not change the state of the hardware 
Who:	Hans Verkuil <hans.verkuil@cisco.com>



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



What:	g_file_storage driver

When:	3.8

Why:	This driver has been superseded by g_mass_storage.

Who:	Alan Stern <stern@rowland.harvard.edu>



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

Documentation/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -2545,6 +2545,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	unknown_nmi_panic

			[X86] Cause panic on unknown NMI.



	usbcore.authorized_default=

			[USB] Default USB device authorization:

			(default -1 = authorized except for wireless USB,

			0 = not authorized, 1 = authorized)



	usbcore.autosuspend=

			[USB] The autosuspend time delay (in seconds) used

			for newly-detected USB devices (default 2).  This

Documentation/usb/ehci.txt

+2 −0
Original line number Diff line number Diff line
@@ -210,3 +210,5 @@ TBD: Interrupt and ISO transfer performance issues. Those periodic 
transfers are fully scheduled, so the main issue is likely to be how

to trigger "high bandwidth" modes.



TBD:  More than standard 80% periodic bandwidth allocation is possible

through sysfs uframe_periodic_max parameter. Describe that.

Documentation/usb/gadget_hid.txt

+3 −3
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ Send and receive HID reports 
	HID gadget.



	Another interesting example is the caps lock test. Type

	-–caps-lock and hit return. A report is then sent by the

	--caps-lock and hit return. A report is then sent by the

	gadget and you should receive the host answer, corresponding

	to the caps lock LED status.