These changes are a raw update to a vanilla kernel 4.1.10, with the

[kvmfornfv.git] / kernel / Documentation / devicetree / bindings / net / ethernet.txt

diff --git a/kernel/Documentation/devicetree/bindings/net/ethernet.txt b/kernel/Documentation/devicetree/bindings/net/ethernet.txt
index 41b3f3f..5d88f37 100644 (file)
--- 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.