-
Notifications
You must be signed in to change notification settings - Fork 0
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.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 ...
- Loading branch information
Showing
220 changed files
with
14,119 additions
and
5,002 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
15 changes: 15 additions & 0 deletions
15
Documentation/ABI/testing/sysfs-platform-phy-rcar-gen3-usb2
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,15 @@ | ||
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. |
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
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,43 @@ | ||
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"; | ||
}; |
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,87 @@ | ||
The device node for Mediatek USB3.0 DRD controller | ||
|
||
Required properties: | ||
- compatible : should be "mediatek,mt8173-mtu3" | ||
- reg : specifies physical base address and size of the registers | ||
- reg-names: should be "mac" for device IP and "ippc" for IP port control | ||
- interrupts : interrupt used by the device IP | ||
- power-domains : a phandle to USB power domain node to control USB's | ||
mtcmos | ||
- vusb33-supply : regulator of USB avdd3.3v | ||
- clocks : a list of phandle + clock-specifier pairs, one for each | ||
entry in clock-names | ||
- clock-names : must contain "sys_ck" for clock of controller; | ||
"wakeup_deb_p0" and "wakeup_deb_p1" are optional, they are | ||
depends on "mediatek,enable-wakeup" | ||
- phys : a list of phandle + phy specifier pairs | ||
- dr_mode : should be one of "host", "peripheral" or "otg", | ||
refer to usb/generic.txt | ||
|
||
Optional properties: | ||
- #address-cells, #size-cells : should be '2' if the device has sub-nodes | ||
with 'reg' property | ||
- ranges : allows valid 1:1 translation between child's address space and | ||
parent's address space | ||
- extcon : external connector for vbus and idpin changes detection, needed | ||
when supports dual-role mode. | ||
- vbus-supply : reference to the VBUS regulator, needed when supports | ||
dual-role mode. | ||
- pinctl-names : a pinctrl state named "default" must be defined, | ||
"id_float" and "id_ground" are optinal which depends on | ||
"mediatek,enable-manual-drd" | ||
- pinctrl-0 : pin control group | ||
See: Documentation/devicetree/bindings/pinctrl/pinctrl-binding.txt | ||
|
||
- maximum-speed : valid arguments are "super-speed", "high-speed" and | ||
"full-speed"; refer to usb/generic.txt | ||
- enable-manual-drd : supports manual dual-role switch via debugfs; usually | ||
used when receptacle is TYPE-A and also wants to support dual-role | ||
mode. | ||
- mediatek,enable-wakeup : supports ip sleep wakeup used by host mode | ||
- mediatek,syscon-wakeup : phandle to syscon used to access USB wakeup | ||
control register, it depends on "mediatek,enable-wakeup". | ||
|
||
Sub-nodes: | ||
The xhci should be added as subnode to mtu3 as shown in the following example | ||
if host mode is enabled. The DT binding details of xhci can be found in: | ||
Documentation/devicetree/bindings/usb/mt8173-xhci.txt | ||
|
||
Example: | ||
ssusb: usb@11271000 { | ||
compatible = "mediatek,mt8173-mtu3"; | ||
reg = <0 0x11271000 0 0x3000>, | ||
<0 0x11280700 0 0x0100>; | ||
reg-names = "mac", "ippc"; | ||
interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_LOW>; | ||
phys = <&phy_port0 PHY_TYPE_USB3>, | ||
<&phy_port1 PHY_TYPE_USB2>; | ||
power-domains = <&scpsys MT8173_POWER_DOMAIN_USB>; | ||
clocks = <&topckgen CLK_TOP_USB30_SEL>, | ||
<&pericfg CLK_PERI_USB0>, | ||
<&pericfg CLK_PERI_USB1>; | ||
clock-names = "sys_ck", | ||
"wakeup_deb_p0", | ||
"wakeup_deb_p1"; | ||
vusb33-supply = <&mt6397_vusb_reg>; | ||
vbus-supply = <&usb_p0_vbus>; | ||
extcon = <&extcon_usb>; | ||
dr_mode = "otg"; | ||
mediatek,enable-wakeup; | ||
mediatek,syscon-wakeup = <&pericfg>; | ||
#address-cells = <2>; | ||
#size-cells = <2>; | ||
ranges; | ||
status = "disabled"; | ||
|
||
usb_host: xhci@11270000 { | ||
compatible = "mediatek,mt8173-xhci"; | ||
reg = <0 0x11270000 0 0x1000>; | ||
reg-names = "mac"; | ||
interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_LOW>; | ||
power-domains = <&scpsys MT8173_POWER_DOMAIN_USB>; | ||
clocks = <&topckgen CLK_TOP_USB30_SEL>; | ||
clock-names = "sys_ck"; | ||
vusb33-supply = <&mt6397_vusb_reg>; | ||
status = "disabled"; | ||
}; | ||
}; |
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,23 @@ | ||
DA8XX USB OHCI controller | ||
|
||
Required properties: | ||
|
||
- compatible: Should be "ti,da830-ohci" | ||
- reg: Should contain one register range i.e. start and length | ||
- interrupts: Description of the interrupt line | ||
- phys: Phandle for the PHY device | ||
- phy-names: Should be "usb-phy" | ||
|
||
Optional properties: | ||
- vbus-supply: phandle of regulator that controls vbus power / over-current | ||
|
||
Example: | ||
|
||
ohci: usb@0225000 { | ||
compatible = "ti,da830-ohci"; | ||
reg = <0x225000 0x1000>; | ||
interrupts = <59>; | ||
phys = <&usb_phy 1>; | ||
phy-names = "usb-phy"; | ||
vbus-supply = <®_usb_ohci>; | ||
}; |
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,22 @@ | ||
Samsung S3C2410 and compatible SoC USB controller | ||
|
||
OHCI | ||
|
||
Required properties: | ||
- compatible: should be "samsung,s3c2410-ohci" for USB host controller | ||
- reg: address and lenght of the controller memory mapped region | ||
- interrupts: interrupt number for the USB OHCI controller | ||
- clocks: Should reference the bus and host clocks | ||
- clock-names: Should contain two strings | ||
"usb-bus-host" for the USB bus clock | ||
"usb-host" for the USB host clock | ||
|
||
Example: | ||
|
||
usb0: ohci@49000000 { | ||
compatible = "samsung,s3c2410-ohci"; | ||
reg = <0x49000000 0x100>; | ||
interrupts = <0 0 26 3>; | ||
clocks = <&clocks UCLK>, <&clocks HCLK_USBH>; | ||
clock-names = "usb-bus-host", "usb-host"; | ||
}; |
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
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
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
Oops, something went wrong.