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

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

Pull USB patches from Greg Kroah-Hartman:
 "Here's the big USB pull request for 3.10-rc1.

  Lots of USB patches here, the majority being USB gadget changes and
  USB-serial driver cleanups, the rest being ARM build fixes / cleanups,
  and individual driver updates.  We also finally got some chipidea
  fixes, which have been delayed for a number of kernel releases, as the
  maintainer has now reappeared.

  All of these have been in linux-next for a while"

* tag 'usb-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (568 commits)
  USB: ehci-msm: USB_MSM_OTG needs USB_PHY
  USB: OHCI: avoid conflicting platform drivers
  USB: OMAP: ISP1301 needs USB_PHY
  USB: lpc32xx: ISP1301 needs USB_PHY
  USB: ftdi_sio: enable two UART ports on ST Microconnect Lite
  usb: phy: tegra: don't call into tegra-ehci directly
  usb: phy: phy core cannot yet be a module
  USB: Fix initconst in ehci driver
  usb-storage: CY7C68300A chips do not support Cypress ATACB
  USB: serial: option: Added support Olivetti Olicard 145
  USB: ftdi_sio: correct ST Micro Connect Lite PIDs
  ARM: mxs_defconfig: add CONFIG_USB_PHY
  ARM: imx_v6_v7_defconfig: add CONFIG_USB_PHY
  usb: phy: remove exported function from __init section
  usb: gadget: zero: put function instances on unbind
  usb: gadget: f_sourcesink.c: correct a copy-paste misnomer
  usb: gadget: cdc2: fix error return code in cdc_do_config()
  usb: gadget: multi: fix error return code in rndis_do_config()
  usb: gadget: f_obex: fix error return code in obex_bind()
  USB: storage: convert to use module_usb_driver()
  ...
parents 507ffe4f 4626b8da

Documentation/ABI/testing/sysfs-bus-usb

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ Date: January 2008 
KernelVersion:	2.6.25

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

Description:

		If CONFIG_PM and CONFIG_USB_SUSPEND are enabled, then this file

		If CONFIG_PM_RUNTIME is enabled then this file

		is present.  When read, it returns the total time (in msec)

		that the USB device has been connected to the machine.  This

		file is read-only.
@@ -45,7 +45,7 @@ Date: January 2008 
KernelVersion:	2.6.25

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

Description:

		If CONFIG_PM and CONFIG_USB_SUSPEND are enabled, then this file

		If CONFIG_PM_RUNTIME is enabled then this file

		is present.  When read, it returns the total time (in msec)

		that the USB device has been active, i.e. not in a suspended

		state.  This file is read-only.
@@ -187,7 +187,7 @@ What: /sys/bus/usb/devices/.../power/usb2_hardware_lpm 
Date:		September 2011

Contact:	Andiry Xu <andiry.xu@amd.com>

Description:

		If CONFIG_USB_SUSPEND is set and a USB 2.0 lpm-capable device

		If CONFIG_PM_RUNTIME is set and a USB 2.0 lpm-capable device

		is plugged in to a xHCI host which support link PM, it will

		perform a LPM test; if the test is passed and host supports

		USB2 hardware LPM (xHCI 1.0 feature), USB2 hardware LPM will

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

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Optional properties: 
  that indicate usb controller index

- vbus-supply: regulator for vbus

- disable-over-current: disable over current detect

- external-vbus-divider: enables off-chip resistor divider for Vbus



Examples:

usb@02184000 { /* USB OTG */
@@ -20,4 +21,5 @@ usb@02184000 { /* USB OTG */ 
	fsl,usbphy = <&usbphy1>;

	fsl,usbmisc = <&usbmisc 0>;

	disable-over-current;

	external-vbus-divider;

};

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

0 → 100644
+32 −0
Original line number Diff line number Diff line 
OMAP HS USB EHCI controller



This device is usually the child of the omap-usb-host

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



Required properties:



- compatible: should be "ti,ehci-omap"

- reg: should contain one register range i.e. start and length

- interrupts: description of the interrupt line



Optional properties:



- phys: list of phandles to PHY nodes.

  This property is required if at least one of the ports are in

  PHY mode i.e. OMAP_EHCI_PORT_MODE_PHY



To specify the port mode, see

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



Example for OMAP4:



usbhsehci: ehci@4a064c00 {

	compatible = "ti,ehci-omap", "usb-ehci";

	reg = <0x4a064c00 0x400>;

	interrupts = <0 77 0x4>;

};



&usbhsehci {

	phys = <&hsusb1_phy 0 &hsusb3_phy>;

};

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

0 → 100644
+15 −0
Original line number Diff line number Diff line 
OMAP HS USB OHCI controller (OMAP3 and later)



Required properties:



- compatible: should be "ti,ohci-omap3"

- reg: should contain one register range i.e. start and length

- interrupts: description of the interrupt line



Example for OMAP4:



usbhsohci: ohci@4a064800 {

	compatible = "ti,ohci-omap3", "usb-ohci";

	reg = <0x4a064800 0x400>;

	interrupts = <0 76 0x4>;

};

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

+34 −6
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ OMAP MUSB GLUE 
   and disconnect.

 - 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

 - 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

 - 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"
@@ -29,18 +29,46 @@ usb_otg_hs: usb_otg_hs@4a0ab000 { 
	ti,hwmods = "usb_otg_hs";

	ti,has-mailbox;

	multipoint = <1>;

	num_eps = <16>;

	ram_bits = <12>;

	num-eps = <16>;

	ram-bits = <12>;

	ctrl-module = <&omap_control_usb>;

};



Board specific device node entry

&usb_otg_hs {

	interface_type = <1>;

	interface-type = <1>;

	mode = <3>;

	power = <50>;

};



OMAP DWC3 GLUE

 - compatible : Should be "ti,dwc3"

 - ti,hwmods : Should be "usb_otg_ss"

 - reg : Address and length of the register set for the device.

 - interrupts : The irq number of this device that is used to interrupt the

   MPU

 - #address-cells, #size-cells : Must be present if the device has sub-nodes

 - utmi-mode : controls the source of UTMI/PIPE status for VBUS and OTG ID.

   It should be set to "1" for HW mode and "2" for SW mode.

 - ranges: the child address space are mapped 1:1 onto the parent address space



Sub-nodes:

The dwc3 core should be added as subnode to omap dwc3 glue.

- dwc3 :

   The binding details of dwc3 can be found in:

   Documentation/devicetree/bindings/usb/dwc3.txt



omap_dwc3 {

	compatible = "ti,dwc3";

	ti,hwmods = "usb_otg_ss";

	reg = <0x4a020000 0x1ff>;

	interrupts = <0 93 4>;

	#address-cells = <1>;

	#size-cells = <1>;

	utmi-mode = <2>;

	ranges;

};



OMAP CONTROL USB



Required properties:

CRA Git | Maintained and supported by SUSTech CRA and CCSE