summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/usb/dwc2.txt
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2016-11-16 16:19:34 +0300
committerThomas Gleixner <tglx@linutronix.de>2016-11-16 16:19:34 +0300
commit7ce7f35b33eb42b6aa4cf176fa34372b21b8472b (patch)
tree12f3027003f1d7cce30f838265e4fab2d52c6cef /Documentation/devicetree/bindings/usb/dwc2.txt
parentf410770293a1fbc08906474c24104a7a11943eb6 (diff)
parent47bdf3378d62a627cfb8a54e1180c08d67078b61 (diff)
downloadlinux-7ce7f35b33eb42b6aa4cf176fa34372b21b8472b.tar.xz
Merge branch 'x86/cpufeature' into x86/cache
Resolve the cpu/scattered conflict. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'Documentation/devicetree/bindings/usb/dwc2.txt')
-rw-r--r--Documentation/devicetree/bindings/usb/dwc2.txt5
1 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/usb/dwc2.txt b/Documentation/devicetree/bindings/usb/dwc2.txt
index 455f2c310a1b..2c30a5479069 100644
--- a/Documentation/devicetree/bindings/usb/dwc2.txt
+++ b/Documentation/devicetree/bindings/usb/dwc2.txt
@@ -28,10 +28,7 @@ Refer to phy/phy-bindings.txt for generic phy consumer properties
- g-use-dma: enable dma usage in gadget driver.
- g-rx-fifo-size: size of rx fifo size in gadget mode.
- g-np-tx-fifo-size: size of non-periodic tx fifo size in gadget mode.
-
-Deprecated properties:
-- g-tx-fifo-size: size of periodic tx fifo per endpoint (except ep0)
- in gadget mode.
+- g-tx-fifo-size: size of periodic tx fifo per endpoint (except ep0) in gadget mode.
Example: