diff options
Diffstat (limited to 'kernel/Documentation')
4 files changed, 8 insertions, 7 deletions
diff --git a/kernel/Documentation/ABI/testing/configfs-usb-gadget-loopback b/kernel/Documentation/ABI/testing/configfs-usb-gadget-loopback index 9aae5bfb9..06beefbcf 100644 --- a/kernel/Documentation/ABI/testing/configfs-usb-gadget-loopback +++ b/kernel/Documentation/ABI/testing/configfs-usb-gadget-loopback @@ -5,4 +5,4 @@ Description: The attributes: qlen - depth of loopback queue - bulk_buflen - buffer length + buflen - buffer length diff --git a/kernel/Documentation/ABI/testing/configfs-usb-gadget-sourcesink b/kernel/Documentation/ABI/testing/configfs-usb-gadget-sourcesink index 29477c319..bc7ff731a 100644 --- a/kernel/Documentation/ABI/testing/configfs-usb-gadget-sourcesink +++ b/kernel/Documentation/ABI/testing/configfs-usb-gadget-sourcesink @@ -9,4 +9,4 @@ Description: isoc_maxpacket - 0 - 1023 (fs), 0 - 1024 (hs/ss) isoc_mult - 0..2 (hs/ss only) isoc_maxburst - 0..15 (ss only) - qlen - buffer length + buflen - buffer length diff --git a/kernel/Documentation/devicetree/bindings/net/ethernet.txt b/kernel/Documentation/devicetree/bindings/net/ethernet.txt index 41b3f3f86..5d88f3748 100644 --- a/kernel/Documentation/devicetree/bindings/net/ethernet.txt +++ b/kernel/Documentation/devicetree/bindings/net/ethernet.txt @@ -25,7 +25,11 @@ The following properties are common to the Ethernet controllers: flow control thresholds. - tx-fifo-depth: the size of the controller's transmit fifo in bytes. This is used for components that can have configurable fifo sizes. +- managed: string, specifies the PHY management type. Supported values are: + "auto", "in-band-status". "auto" is the default, it usess MDIO for + management if fixed-link is not specified. Child nodes of the Ethernet controller are typically the individual PHY devices connected via the MDIO bus (sometimes the MDIO bus controller is separate). They are described in the phy.txt file in this same directory. +For non-MDIO PHY management see fixed-link.txt. diff --git a/kernel/Documentation/usb/gadget-testing.txt b/kernel/Documentation/usb/gadget-testing.txt index f45b2bf4b..820664af8 100644 --- a/kernel/Documentation/usb/gadget-testing.txt +++ b/kernel/Documentation/usb/gadget-testing.txt @@ -237,9 +237,7 @@ Testing the LOOPBACK function ----------------------------- device: run the gadget -host: test-usb - -http://www.linux-usb.org/usbtest/testusb.c +host: test-usb (tools/usb/testusb.c) 8. MASS STORAGE function ======================== @@ -588,9 +586,8 @@ Testing the SOURCESINK function ------------------------------- device: run the gadget -host: test-usb +host: test-usb (tools/usb/testusb.c) -http://www.linux-usb.org/usbtest/testusb.c 16. UAC1 function ================= |