aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-25 12:31:14 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-25 12:31:14 -0500
commit2d4d9f35bab1cad7f83d10864291d1e50b12c3f9 (patch)
tree24b5f23a1c98e29b8d2daad46133bfb261a8abae /Documentation
parent2193dda5eec60373c7a061c129c6ab9d658f78e9 (diff)
parentebf3992061db1f7b3aa093f37fb308acc74fbc82 (diff)
Merge tag 'usb-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes: usb: patches for v3.19 merge window This time, a very pull request with 216 non-merge commits. Most of the commits contained here are sparse or coccinelle fixes ranging from missing 'static' to returning 0 in case of errors. More importantly, we have the removal the now unnecessary 'driver' argument to ->udc_stop(). DWC2 learned about Dual-Role builds. Users of this IP can now have a single driver built for host and device roles. DWC3 got support for two new HW platforms: Exynos7 and AMD. The Broadcom USB 3.0 Device Controller IP is now supported and so is PLX USB338x, which means DWC3 has lost is badge as the only USB 3.0 peripheral IP supported on Linux. Thanks for Tony Lindgren's work, we can now have a distro-like kernel where all MUSB glue layers can be built into the same kernel (statically or dynamically linked) and it'll work in PIO (DMA will come probably on v3.20). Other than these, the usual set of cleanups and non-critical fixes. Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/ABI/stable/sysfs-class-udc93
-rw-r--r--Documentation/ABI/testing/configfs-usb-gadget-hid11
-rw-r--r--Documentation/ABI/testing/configfs-usb-gadget-midi12
-rw-r--r--Documentation/devicetree/bindings/usb/dwc3.txt23
-rw-r--r--Documentation/devicetree/bindings/usb/exynos-usb.txt6
-rw-r--r--Documentation/devicetree/bindings/usb/pxa-usb.txt22
-rw-r--r--Documentation/usb/gadget_hid.txt7
7 files changed, 172 insertions, 2 deletions
diff --git a/Documentation/ABI/stable/sysfs-class-udc b/Documentation/ABI/stable/sysfs-class-udc
new file mode 100644
index 000000000000..85d3dac2e204
--- /dev/null
+++ b/Documentation/ABI/stable/sysfs-class-udc
@@ -0,0 +1,93 @@
1What: /sys/class/udc/<udc>/a_alt_hnp_support
2Date: June 2011
3KernelVersion: 3.1
4Contact: Felipe Balbi <balbi@kernel.org>
5Description:
6 Indicates if an OTG A-Host supports HNP at an alternate port.
7Users:
8
9What: /sys/class/udc/<udc>/a_hnp_support
10Date: June 2011
11KernelVersion: 3.1
12Contact: Felipe Balbi <balbi@kernel.org>
13Description:
14 Indicates if an OTG A-Host supports HNP at this port.
15Users:
16
17What: /sys/class/udc/<udc>/b_hnp_enable
18Date: June 2011
19KernelVersion: 3.1
20Contact: Felipe Balbi <balbi@kernel.org>
21Description:
22 Indicates if an OTG A-Host enabled HNP support.
23Users:
24
25What: /sys/class/udc/<udc>/current_speed
26Date: June 2011
27KernelVersion: 3.1
28Contact: Felipe Balbi <balbi@kernel.org>
29Description:
30 Indicates the current negotiated speed at this port.
31Users:
32
33What: /sys/class/udc/<udc>/is_a_peripheral
34Date: June 2011
35KernelVersion: 3.1
36Contact: Felipe Balbi <balbi@kernel.org>
37Description:
38 Indicates that this port is the default Host on an OTG session
39 but HNP was used to switch roles.
40Users:
41
42What: /sys/class/udc/<udc>/is_otg
43Date: June 2011
44KernelVersion: 3.1
45Contact: Felipe Balbi <balbi@kernel.org>
46Description:
47 Indicates that this port support OTG.
48Users:
49
50What: /sys/class/udc/<udc>/maximum_speed
51Date: June 2011
52KernelVersion: 3.1
53Contact: Felipe Balbi <balbi@kernel.org>
54Description:
55 Indicates the maximum USB speed supported by this port.
56Users:
57
58What: /sys/class/udc/<udc>/maximum_speed
59Date: June 2011
60KernelVersion: 3.1
61Contact: Felipe Balbi <balbi@kernel.org>
62Description:
63 Indicates the maximum USB speed supported by this port.
64Users:
65
66What: /sys/class/udc/<udc>/soft_connect
67Date: June 2011
68KernelVersion: 3.1
69Contact: Felipe Balbi <balbi@kernel.org>
70Description:
71 Allows users to disconnect data pullup resistors thus causing a
72 logical disconnection from the USB Host.
73Users:
74
75What: /sys/class/udc/<udc>/srp
76Date: June 2011
77KernelVersion: 3.1
78Contact: Felipe Balbi <balbi@kernel.org>
79Description:
80 Allows users to manually start Session Request Protocol.
81Users:
82
83What: /sys/class/udc/<udc>/state
84Date: June 2011
85KernelVersion: 3.1
86Contact: Felipe Balbi <balbi@kernel.org>
87Description:
88 Indicates current state of the USB Device Controller. Valid
89 states are: 'not-attached', 'attached', 'powered',
90 'reconnecting', 'unauthenticated', 'default', 'addressed',
91 'configured', and 'suspended'; however not all USB Device
92 Controllers support reporting all states.
93Users:
diff --git a/Documentation/ABI/testing/configfs-usb-gadget-hid b/Documentation/ABI/testing/configfs-usb-gadget-hid
new file mode 100644
index 000000000000..f12e00e6baa3
--- /dev/null
+++ b/Documentation/ABI/testing/configfs-usb-gadget-hid
@@ -0,0 +1,11 @@
1What: /config/usb-gadget/gadget/functions/hid.name
2Date: Nov 2014
3KernelVersion: 3.19
4Description:
5 The attributes:
6
7 protocol - HID protocol to use
8 report_desc - blob corresponding to HID report descriptors
9 except the data passed through /dev/hidg<N>
10 report_length - HID report length
11 subclass - HID device subclass to use
diff --git a/Documentation/ABI/testing/configfs-usb-gadget-midi b/Documentation/ABI/testing/configfs-usb-gadget-midi
new file mode 100644
index 000000000000..6b341df7249c
--- /dev/null
+++ b/Documentation/ABI/testing/configfs-usb-gadget-midi
@@ -0,0 +1,12 @@
1What: /config/usb-gadget/gadget/functions/midi.name
2Date: Nov 2014
3KernelVersion: 3.19
4Description:
5 The attributes:
6
7 index - index value for the USB MIDI adapter
8 id - ID string for the USB MIDI adapter
9 buflen - MIDI buffer length
10 qlen - USB read request queue length
11 in_ports - number of MIDI input ports
12 out_ports - number of MIDI output ports
diff --git a/Documentation/devicetree/bindings/usb/dwc3.txt b/Documentation/devicetree/bindings/usb/dwc3.txt
index 471366d6a129..cd7f0454e13a 100644
--- a/Documentation/devicetree/bindings/usb/dwc3.txt
+++ b/Documentation/devicetree/bindings/usb/dwc3.txt
@@ -14,6 +14,29 @@ Optional properties:
14 - phys: from the *Generic PHY* bindings 14 - phys: from the *Generic PHY* bindings
15 - phy-names: from the *Generic PHY* bindings 15 - phy-names: from the *Generic PHY* bindings
16 - tx-fifo-resize: determines if the FIFO *has* to be reallocated. 16 - tx-fifo-resize: determines if the FIFO *has* to be reallocated.
17 - snps,disable_scramble_quirk: true when SW should disable data scrambling.
18 Only really useful for FPGA builds.
19 - snps,has-lpm-erratum: true when DWC3 was configured with LPM Erratum enabled
20 - snps,lpm-nyet-threshold: LPM NYET threshold
21 - snps,u2exit_lfps_quirk: set if we want to enable u2exit lfps quirk
22 - snps,u2ss_inp3_quirk: set if we enable P3 OK for U2/SS Inactive quirk
23 - snps,req_p1p2p3_quirk: when set, the core will always request for
24 P1/P2/P3 transition sequence.
25 - snps,del_p1p2p3_quirk: when set core will delay P1/P2/P3 until a certain
26 amount of 8B10B errors occur.
27 - snps,del_phy_power_chg_quirk: when set core will delay PHY power change
28 from P0 to P1/P2/P3.
29 - snps,lfps_filter_quirk: when set core will filter LFPS reception.
30 - snps,rx_detect_poll_quirk: when set core will disable a 400us delay to start
31 Polling LFPS after RX.Detect.
32 - snps,tx_de_emphasis_quirk: when set core will set Tx de-emphasis value.
33 - snps,tx_de_emphasis: the value driven to the PHY is controlled by the
34 LTSSM during USB3 Compliance mode.
35 - snps,dis_u3_susphy_quirk: when set core will disable USB3 suspend phy.
36 - snps,dis_u2_susphy_quirk: when set core will disable USB2 suspend phy.
37 - snps,is-utmi-l1-suspend: true when DWC3 asserts output signal
38 utmi_l1_suspend_n, false when asserts utmi_sleep_n
39 - snps,hird-threshold: HIRD threshold
17 40
18This is usually a subnode to DWC3 glue to which it is connected. 41This is usually a subnode to DWC3 glue to which it is connected.
19 42
diff --git a/Documentation/devicetree/bindings/usb/exynos-usb.txt b/Documentation/devicetree/bindings/usb/exynos-usb.txt
index a3b5990d0f2c..9b4dbe3b2acc 100644
--- a/Documentation/devicetree/bindings/usb/exynos-usb.txt
+++ b/Documentation/devicetree/bindings/usb/exynos-usb.txt
@@ -82,8 +82,10 @@ Example:
82 82
83DWC3 83DWC3
84Required properties: 84Required properties:
85 - compatible: should be "samsung,exynos5250-dwusb3" for USB 3.0 DWC3 85 - compatible: should be one of the following -
86 controller. 86 "samsung,exynos5250-dwusb3": for USB 3.0 DWC3 controller on
87 Exynos5250/5420.
88 "samsung,exynos7-dwusb3": for USB 3.0 DWC3 controller on Exynos7.
87 - #address-cells, #size-cells : should be '1' if the device has sub-nodes 89 - #address-cells, #size-cells : should be '1' if the device has sub-nodes
88 with 'reg' property. 90 with 'reg' property.
89 - ranges: allows valid 1:1 translation between child's address space and 91 - ranges: allows valid 1:1 translation between child's address space and
diff --git a/Documentation/devicetree/bindings/usb/pxa-usb.txt b/Documentation/devicetree/bindings/usb/pxa-usb.txt
index 79729a948d5a..9c331799b87c 100644
--- a/Documentation/devicetree/bindings/usb/pxa-usb.txt
+++ b/Documentation/devicetree/bindings/usb/pxa-usb.txt
@@ -29,3 +29,25 @@ Example:
29 marvell,port-mode = <2>; /* PMM_GLOBAL_MODE */ 29 marvell,port-mode = <2>; /* PMM_GLOBAL_MODE */
30 }; 30 };
31 31
32UDC
33
34Required properties:
35 - compatible: Should be "marvell,pxa270-udc" for USB controllers
36 used in device mode.
37 - reg: usb device MMIO address space
38 - interrupts: single interrupt generated by the UDC IP
39 - clocks: input clock of the UDC IP (see clock-bindings.txt)
40
41Optional properties:
42 - gpios:
43 - gpio activated to control the USB D+ pullup (see gpio.txt)
44
45Example:
46
47 pxa27x_udc: udc@40600000 {
48 compatible = "marvell,pxa270-udc";
49 reg = <0x40600000 0x10000>;
50 interrupts = <11>;
51 clocks = <&pxa2xx_clks 11>;
52 gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
53 };
diff --git a/Documentation/usb/gadget_hid.txt b/Documentation/usb/gadget_hid.txt
index 12696c2e43fb..7a0fb8e16e27 100644
--- a/Documentation/usb/gadget_hid.txt
+++ b/Documentation/usb/gadget_hid.txt
@@ -74,6 +74,13 @@ static struct platform_device my_hid = {
74 You can add as many HID functions as you want, only limited by 74 You can add as many HID functions as you want, only limited by
75 the amount of interrupt endpoints your gadget driver supports. 75 the amount of interrupt endpoints your gadget driver supports.
76 76
77Configuration with configfs
78
79 Instead of adding fake platform devices and drivers in order to pass
80 some data to the kernel, if HID is a part of a gadget composed with
81 configfs the hidg_func_descriptor.report_desc is passed to the kernel
82 by writing the appropriate stream of bytes to a configfs attribute.
83
77Send and receive HID reports 84Send and receive HID reports
78 85
79 HID reports can be sent/received using read/write on the 86 HID reports can be sent/received using read/write on the