forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'usb-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel…
…/git/gregkh/usb
Pull USB/PHY updates from Greg KH:
"Here is the big USB and phy driver patch set for 4.19-rc1.
Nothing huge but there was a lot of work that happened this
development cycle:
- lots of type-c work, with drivers graduating out of staging, and
displayport support being added.
- new PHY drivers
- the normal collection of gadget driver updates and fixes
- code churn to work on the urb handling path, using irqsave()
everywhere in anticipation of making this codepath a lot simpler in
the future.
- usbserial driver fixes and reworks
- other misc changes
All of these have been in linux-next with no reported issues for a
while"
* tag 'usb-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (159 commits)
USB: serial: pl2303: add a new device id for ATEN
usb: renesas_usbhs: Kconfig: convert to SPDX identifiers
usb: dwc3: gadget: Check MaxPacketSize from descriptor
usb: dwc2: Turn on uframe_sched on "stm32f4x9_fsotg" platforms
usb: dwc2: Turn on uframe_sched on "amlogic" platforms
usb: dwc2: Turn on uframe_sched on "his" platforms
usb: dwc2: Turn on uframe_sched on "bcm" platforms
usb: dwc2: gadget: ISOC's starting flow improvement
usb: dwc2: Make dwc2_readl/writel functions endianness-agnostic.
usb: dwc3: core: Enable AutoRetry feature in the controller
usb: dwc3: Set default mode for dwc_usb31
usb: gadget: udc: renesas_usb3: Add register of usb role switch
usb: dwc2: replace ioread32/iowrite32_rep with dwc2_readl/writel_rep
usb: dwc2: Modify dwc2_readl/writel functions prototype
usb: dwc3: pci: Intel Merrifield can be host
usb: dwc3: pci: Supply device properties via driver data
arm64: dts: dwc3: description of incr burst type
usb: dwc3: Enable undefined length INCR burst type
usb: dwc3: add global soc bus configuration reg0
usb: dwc3: Describe 'wakeup_work' field of struct dwc3_pci
...- Loading branch information
Showing
165 changed files
with
5,847 additions
and
1,813 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| These files are deprecated and will be removed. The same files are available | ||
| under /sys/bus/typec (see Documentation/ABI/testing/sysfs-bus-typec). | ||
|
|
||
| What: /sys/class/typec/<port|partner|cable>/<dev>/svid | ||
| Date: April 2017 | ||
| Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com> | ||
| Description: | ||
| The SVID (Standard or Vendor ID) assigned by USB-IF for this | ||
| alternate mode. | ||
|
|
||
| What: /sys/class/typec/<port|partner|cable>/<dev>/mode<index>/ | ||
| Date: April 2017 | ||
| Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com> | ||
| Description: | ||
| Every supported mode will have its own directory. The name of | ||
| a mode will be "mode<index>" (for example mode1), where <index> | ||
| is the actual index to the mode VDO returned by Discover Modes | ||
| USB power delivery command. | ||
|
|
||
| What: /sys/class/typec/<port|partner|cable>/<dev>/mode<index>/description | ||
| Date: April 2017 | ||
| Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com> | ||
| Description: | ||
| Shows description of the mode. The description is optional for | ||
| the drivers, just like with the Billboard Devices. | ||
|
|
||
| What: /sys/class/typec/<port|partner|cable>/<dev>/mode<index>/vdo | ||
| Date: April 2017 | ||
| Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com> | ||
| Description: | ||
| Shows the VDO in hexadecimal returned by Discover Modes command | ||
| for this mode. | ||
|
|
||
| What: /sys/class/typec/<port|partner|cable>/<dev>/mode<index>/active | ||
| Date: April 2017 | ||
| Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com> | ||
| Description: | ||
| Shows if the mode is active or not. The attribute can be used | ||
| for entering/exiting the mode with partners and cable plugs, and | ||
| with the port alternate modes it can be used for disabling | ||
| support for specific alternate modes. Entering/exiting modes is | ||
| supported as synchronous operation so write(2) to the attribute | ||
| does not return until the enter/exit mode operation has | ||
| finished. The attribute is notified when the mode is | ||
| entered/exited so poll(2) on the attribute wakes up. | ||
| Entering/exiting a mode will also generate uevent KOBJ_CHANGE. | ||
|
|
||
| Valid values: yes, no |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| What: /sys/bus/typec/devices/.../active | ||
| Date: July 2018 | ||
| Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com> | ||
| Description: | ||
| Shows if the mode is active or not. The attribute can be used | ||
| for entering/exiting the mode. Entering/exiting modes is | ||
| supported as synchronous operation so write(2) to the attribute | ||
| does not return until the enter/exit mode operation has | ||
| finished. The attribute is notified when the mode is | ||
| entered/exited so poll(2) on the attribute wakes up. | ||
| Entering/exiting a mode will also generate uevent KOBJ_CHANGE. | ||
|
|
||
| Valid values are boolean. | ||
|
|
||
| What: /sys/bus/typec/devices/.../description | ||
| Date: July 2018 | ||
| Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com> | ||
| Description: | ||
| Shows description of the mode. The description is optional for | ||
| the drivers, just like with the Billboard Devices. | ||
|
|
||
| What: /sys/bus/typec/devices/.../mode | ||
| Date: July 2018 | ||
| Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com> | ||
| Description: | ||
| The index number of the mode returned by Discover Modes USB | ||
| Power Delivery command. Depending on the alternate mode, the | ||
| mode index may be significant. | ||
|
|
||
| With some alternate modes (SVIDs), the mode index is assigned | ||
| for specific functionality in the specification for that | ||
| alternate mode. | ||
|
|
||
| With other alternate modes, the mode index values are not | ||
| assigned, and can not be therefore used for identification. When | ||
| the mode index is not assigned, identifying the alternate mode | ||
| must be done with either mode VDO or the description. | ||
|
|
||
| What: /sys/bus/typec/devices/.../svid | ||
| Date: July 2018 | ||
| Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com> | ||
| Description: | ||
| The Standard or Vendor ID (SVID) assigned by USB-IF for this | ||
| alternate mode. | ||
|
|
||
| What: /sys/bus/typec/devices/.../vdo | ||
| Date: July 2018 | ||
| Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com> | ||
| Description: | ||
| Shows the VDO in hexadecimal returned by Discover Modes command | ||
| for this mode. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| What: /sys/bus/typec/devices/.../displayport/configuration | ||
| Date: July 2018 | ||
| Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com> | ||
| Description: | ||
| Shows the current DisplayPort configuration for the connector. | ||
| Valid values are USB, source and sink. Source means DisplayPort | ||
| source, and sink means DisplayPort sink. | ||
|
|
||
| All supported configurations are listed as space separated list | ||
| with the active one wrapped in square brackets. | ||
|
|
||
| Source example: | ||
|
|
||
| USB [source] sink | ||
|
|
||
| The configuration can be changed by writing to the file | ||
|
|
||
| Note. USB configuration does not equal to Exit Mode. It is | ||
| separate configuration defined in VESA DisplayPort Alt Mode on | ||
| USB Type-C Standard. Functionally it equals to the situation | ||
| where the mode has been exited (to exit the mode, see | ||
| Documentation/ABI/testing/sysfs-bus-typec, and use file | ||
| /sys/bus/typec/devices/.../active). | ||
|
|
||
| What: /sys/bus/typec/devices/.../displayport/pin_assignment | ||
| Date: July 2018 | ||
| Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com> | ||
| Description: | ||
| VESA DisplayPort Alt Mode on USB Type-C Standard defines six | ||
| different pin assignments for USB Type-C connector that are | ||
| labeled A, B, C, D, E, and F. The supported pin assignments are | ||
| listed as space separated list with the active one wrapped in | ||
| square brackets. | ||
|
|
||
| Example: | ||
|
|
||
| C [D] | ||
|
|
||
| Pin assignment can be changed by writing to the file. It is | ||
| possible to set pin assignment before configuration has been | ||
| set, but the assignment will not be active before the | ||
| connector is actually configured. | ||
|
|
||
| Note. As of VESA DisplayPort Alt Mode on USB Type-C Standard | ||
| version 1.0b, pin assignments A, B, and F are deprecated. Only | ||
| pin assignment D can now carry simultaneously one channel of | ||
| USB SuperSpeed protocol. From user perspective pin assignments C | ||
| and E are equal, where all channels on the connector are used | ||
| for carrying DisplayPort protocol (allowing higher resolutions). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
Documentation/devicetree/bindings/phy/brcm,sr-pcie-phy.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| Broadcom Stingray PCIe PHY | ||
|
|
||
| Required properties: | ||
| - compatible: must be "brcm,sr-pcie-phy" | ||
| - reg: base address and length of the PCIe SS register space | ||
| - brcm,sr-cdru: phandle to the CDRU syscon node | ||
| - brcm,sr-mhb: phandle to the MHB syscon node | ||
| - #phy-cells: Must be 1, denotes the PHY index | ||
|
|
||
| For PAXB based root complex, one can have a configuration of up to 8 PHYs | ||
| PHY index goes from 0 to 7 | ||
|
|
||
| For the internal PAXC based root complex, PHY index is always 8 | ||
|
|
||
| Example: | ||
| mhb: syscon@60401000 { | ||
| compatible = "brcm,sr-mhb", "syscon"; | ||
| reg = <0 0x60401000 0 0x38c>; | ||
| }; | ||
|
|
||
| cdru: syscon@6641d000 { | ||
| compatible = "brcm,sr-cdru", "syscon"; | ||
| reg = <0 0x6641d000 0 0x400>; | ||
| }; | ||
|
|
||
| pcie_phy: phy@40000000 { | ||
| compatible = "brcm,sr-pcie-phy"; | ||
| reg = <0 0x40000000 0 0x800>; | ||
| brcm,sr-cdru = <&cdru>; | ||
| brcm,sr-mhb = <&mhb>; | ||
| #phy-cells = <1>; | ||
| }; | ||
|
|
||
| /* users of the PCIe PHY */ | ||
|
|
||
| pcie0: pcie@48000000 { | ||
| ... | ||
| ... | ||
| phys = <&pcie_phy 0>; | ||
| phy-names = "pcie-phy"; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
Documentation/devicetree/bindings/phy/rcar-gen3-phy-pcie.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| * Renesas R-Car generation 3 PCIe PHY | ||
|
|
||
| This file provides information on what the device node for the R-Car | ||
| generation 3 PCIe PHY contains. | ||
|
|
||
| Required properties: | ||
| - compatible: "renesas,r8a77980-pcie-phy" if the device is a part of the | ||
| R8A77980 SoC. | ||
| - reg: offset and length of the register block. | ||
| - clocks: clock phandle and specifier pair. | ||
| - power-domains: power domain phandle and specifier pair. | ||
| - resets: reset phandle and specifier pair. | ||
| - #phy-cells: see phy-bindings.txt in the same directory, must be <0>. | ||
|
|
||
| Example (R-Car V3H): | ||
|
|
||
| pcie-phy@e65d0000 { | ||
| compatible = "renesas,r8a77980-pcie-phy"; | ||
| reg = <0 0xe65d0000 0 0x8000>; | ||
| #phy-cells = <0>; | ||
| clocks = <&cpg CPG_MOD 319>; | ||
| power-domains = <&sysc 32>; | ||
| resets = <&cpg 319>; | ||
| }; |
Oops, something went wrong.