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

Commit 2a298679 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB updates from Greg KH:
 "Here's the big USB patchset for 4.2-rc1.  As is normal these days, the
  majority of changes are in the gadget drivers, with a bunch of other
  small driver changes.

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

* tag 'usb-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (175 commits)
  usb: dwc3: Use ASCII space in Kconfig
  usb: chipidea: add work-around for Marvell HSIC PHY startup
  usb: chipidea: allow multiple instances to use default ci_default_pdata
  dt-bindings: Consolidate ChipIdea USB ci13xxx bindings
  phy: add Marvell HSIC 28nm PHY
  phy: Add Marvell USB 2.0 OTG 28nm PHY
  dt-bindings: Add Marvell PXA1928 USB and HSIC PHY bindings
  USB: ssb: use devm_kzalloc
  USB: ssb: fix error handling in ssb_hcd_create_pdev()
  usb: isp1760: check for null return from kzalloc
  cdc-acm: Add support of ATOL FPrint fiscal printers
  usb: chipidea: usbmisc_imx: Remove unneeded semicolon
  USB: usbtmc: add device quirk for Rigol DS6104
  USB: serial: mos7840: Use setup_timer
  phy: twl4030-usb: add ABI documentation
  phy: twl4030-usb: remove incorrect pm_runtime_get_sync() in probe function.
  phy: twl4030-usb: remove pointless 'suspended' test in 'suspend' callback.
  phy: twl4030-usb: make runtime pm more reliable.
  drivers:usb:fsl: Fix compilation error for fsl ehci drv
  usb: renesas_usbhs: Don't disable the pipe if Control write status stage
  ...
parents 8c7febe8 50641056

Documentation/ABI/testing/sysfs-platform-twl4030-usb

0 → 100644
+8 −0
Original line number Diff line number Diff line 
What: /sys/bus/platform/devices/*twl4030-usb/vbus

Description:

	Read-only status reporting if VBUS (approx 5V)

	is being supplied by the USB bus.



	Possible values: "on", "off".



	Changes are notified via select/poll.

Documentation/devicetree/bindings/phy/brcm,brcmstb-sata-phy.txt

0 → 100644
+40 −0
Original line number Diff line number Diff line 
* Broadcom SATA3 PHY for STB



Required properties:

- compatible: should be one or more of

     "brcm,bcm7445-sata-phy"

     "brcm,phy-sata3"

- address-cells: should be 1

- size-cells: should be 0

- reg: register range for the PHY PCB interface

- reg-names: should be "phy"



Sub-nodes:

  Each port's PHY should be represented as a sub-node.



Sub-nodes required properties:

- reg: the PHY number

- phy-cells: generic PHY binding; must be 0

Optional:

- brcm,enable-ssc: use spread spectrum clocking (SSC) on this port





Example:



	sata-phy@f0458100 {

		compatible = "brcm,bcm7445-sata-phy", "brcm,phy-sata3";

		reg = <0xf0458100 0x1e00>, <0xf045804c 0x10>;

		reg-names = "phy";

		#address-cells = <1>;

		#size-cells = <0>;



		sata-phy@0 {

			reg = <0>;

			#phy-cells = <0>;

		};



		sata-phy@1 {

			reg = <1>;

			#phy-cells = <0>;

		};

	};

Documentation/devicetree/bindings/phy/pxa1928-usb-phy.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
* Marvell PXA1928 USB and HSIC PHYs



Required properties:

- compatible: "marvell,pxa1928-usb-phy" or "marvell,pxa1928-hsic-phy"

- reg: base address and length of the registers

- clocks - A single clock. From common clock binding.

- #phys-cells: should be 0. From commmon phy binding.

- resets: reference to the reset controller



Example:



	usbphy: phy@7000 {

		compatible = "marvell,pxa1928-usb-phy";

		reg = <0x7000 0xe0>;

		clocks = <&apmu_clocks PXA1928_CLK_USB>;

		#phy-cells = <0>;

	};

Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ This file provides information on what the device node for the R-Car generation 
Required properties:

- compatible: "renesas,usb-phy-r8a7790" if the device is a part of R8A7790 SoC.

	      "renesas,usb-phy-r8a7791" if the device is a part of R8A7791 SoC.

	      "renesas,usb-phy-r8a7794" if the device is a part of R8A7794 SoC.

- reg: offset and length of the register block.

- #address-cells: number of address cells for the USB channel subnodes, must

		  be <1>.

Documentation/devicetree/bindings/power/twl-charger.txt

+10 −0
Original line number Diff line number Diff line 
TWL BCI (Battery Charger Interface)



The battery charger needs to interact with the USB phy in order

to know when charging is permissible, and when there is a connection

or disconnection.



The choice of phy cannot be configured at a hardware level, so there

is no value in explicit configuration in device-tree.  Rather

if there is a sibling of the BCI node which is compatible with

"ti,twl4030-usb", then that is used to determine when and how

use USB power for charging.



Required properties:

- compatible:

  - "ti,twl4030-bci"