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

Commit 03f8d4cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB/PHY updates from Greg KH:
 "Here's the big set of USB/PHY patches for 4.10-rc1.

  A number of new drivers are here in this set of changes. We have a new
  USB controller type "mtu3", a new usb-serial driver, and the usual
  churn in the gadget subsystem and the xhci host controller driver,
  along with a few other new small drivers added. And lots of little
  other changes all over the USB and PHY driver tree. Full details are
  in the shortlog

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'usb-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (309 commits)
  USB: serial: option: add dlink dwm-158
  USB: serial: option: add support for Telit LE922A PIDs 0x1040, 0x1041
  USB: OHCI: nxp: fix code warnings
  USB: OHCI: nxp: remove useless extern declaration
  USB: OHCI: at91: remove useless extern declaration
  usb: misc: rio500: fix result type for error message
  usb: mtu3: fix U3 port link issue
  usb: mtu3: enable auto switch from U3 to U2
  usbip: fix warning in vhci_hcd_probe/lockdep_init_map
  usb: core: usbport: Use proper LED API to fix potential crash
  usbip: add missing compile time generated files to .gitignore
  usb: hcd.h: construct hub class request constants from simpler constants
  USB: OHCI: ohci-pxa27x: remove useless functions
  USB: OHCI: omap: remove useless extern declaration
  USB: OHCI: ohci-omap: remove useless functions
  USB: OHCI: ohci-s3c2410: remove useless functions
  USB: cdc-acm: add device id for GW Instek AFG-125
  fsl/usb: Workarourd for USB erratum-A005697
  usb: hub: Wait for connection to be reestablished after port reset
  usbip: vudc: Refactor init_vudc_hw() to be more obvious
  ...
parents a67485d4 d8a12b71

Documentation/ABI/stable/sysfs-devices

+14 −0
Original line number Diff line number Diff line
@@ -8,3 +8,17 @@ Description: 
		Any device associated with a device-tree node will have

		an of_path symlink pointing to the corresponding device

		node in /sys/firmware/devicetree/



What:		/sys/devices/*/devspec

Date:		October 2016

Contact:	Device Tree mailing list <devicetree@vger.kernel.org>

Description:

		If CONFIG_OF is enabled, then this file is present. When

		read, it returns full name of the device node.



What:		/sys/devices/*/obppath

Date:		October 2016

Contact:	Device Tree mailing list <devicetree@vger.kernel.org>

Description:

		If CONFIG_OF is enabled, then this file is present. When

		read, it returns full name of the device node.

Documentation/ABI/testing/sysfs-platform-phy-rcar-gen3-usb2

0 → 100644
+15 −0
Original line number Diff line number Diff line 
What:		/sys/devices/platform/<phy-name>/role

Date:		October 2016

KernelVersion:	4.10

Contact:	Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

Description:

		This file can be read and write.

		The file can show/change the phy mode for role swap of usb.



		Write the following strings to change the mode:

		 "host" - switching mode from peripheral to host.

		 "peripheral" - switching mode from host to peripheral.



		Read the file, then it shows the following strings:

		 "host" - The mode is host now.

		 "peripheral" - The mode is peripheral now.

Documentation/devicetree/bindings/extcon/extcon-usb-gpio.txt

+3 −0
Original line number Diff line number Diff line
@@ -5,7 +5,10 @@ connected to a GPIO pin. 


Required properties:

- compatible: Should be "linux,extcon-usb-gpio"



Either one of id-gpio or vbus-gpio must be present. Both can be present as well.

- id-gpio: gpio for USB ID pin. See gpio binding.

- vbus-gpio: gpio for USB VBUS pin.



Example: Examples of extcon-usb-gpio node in dra7-evm.dts as listed below:

	extcon_usb1 {

Documentation/devicetree/bindings/phy/meson-usb2-phy.txt→Documentation/devicetree/bindings/phy/meson8b-usb2-phy.txt

+3 −3
Original line number Diff line number Diff line 
* Amlogic USB2 PHY

* Amlogic Meson8b and GXBB USB2 PHY



Required properties:

- compatible:	Depending on the platform this should be one of:
@@ -16,10 +16,10 @@ Optional properties: 


Example:



usb0_phy: usb_phy@0 {

usb0_phy: usb-phy@c0000000 {

	compatible = "amlogic,meson-gxbb-usb2-phy";

	#phy-cells = <0>;

	reg = <0x0 0x0 0x0 0x20>;

	reg = <0x0 0xc0000000 0x0 0x20>;

	resets = <&reset RESET_USB_OTG>;

	clocks = <&clkc CLKID_USB>, <&clkc CLKID_USB0>;

	clock-names = "usb_general", "usb";

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

0 → 100644
+43 −0
Original line number Diff line number Diff line 
TI DA8xx MUSB

~~~~~~~~~~~~~

For DA8xx/OMAP-L1x/AM17xx/AM18xx platforms.



Required properties:

~~~~~~~~~~~~~~~~~~~~

 - compatible : Should be set to "ti,da830-musb".



 - reg: Offset and length of the USB controller register set.



 - interrupts: The USB interrupt number.



 - interrupt-names: Should be set to "mc".



 - dr_mode: The USB operation mode. Should be one of "host", "peripheral" or "otg".



 - phys: Phandle for the PHY device



 - phy-names: Should be "usb-phy"



Optional properties:

~~~~~~~~~~~~~~~~~~~~

 - vbus-supply: Phandle to a regulator providing the USB bus power.



Example:

	usb_phy: usb-phy {

		compatible = "ti,da830-usb-phy";

		#phy-cells = <0>;

		status = "okay";

	};

	usb0: usb@200000 {

		compatible = "ti,da830-musb";

		reg =   <0x00200000 0x10000>;

		interrupts = <58>;

		interrupt-names = "mc";



		dr_mode = "host";

		vbus-supply = <&usb_vbus>;

		phys = <&usb_phy 0>;

		phy-names = "usb-phy";



		status = "okay";

	};