Merge tag 'devicetree-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git...

[muen/linux.git] / Documentation / devicetree / bindings / net / ethernet.txt

diff --git a/Documentation/devicetree/bindings/net/ethernet.txt b/Documentation/devicetree/bindings/net/ethernet.txt
index 08dd263beeb900c19db0cc5daadabd643aff4949..7da86f22a13b80843d087fe859d6633de4d8b11d 100644 (file)
--- a/Documentation/devicetree/bindings/net/ethernet.txt
+++ b/Documentation/devicetree/bindings/net/ethernet.txt
@@ -12,6 +12,7 @@ The following properties are common to the Ethernet controllers:
   Specification).
 - phy-mode: string, operation mode of the PHY interface. This is now a de-facto
   standard property; supported values are:
   Specification).
 - phy-mode: string, operation mode of the PHY interface. This is now a de-facto
   standard property; supported values are:

+  * "internal"

   * "mii"
   * "gmii"
   * "sgmii"
   * "mii"
   * "gmii"
   * "sgmii"


@@ -33,6 +34,8 @@ The following properties are common to the Ethernet controllers:
   * "2000base-x",
   * "2500base-x",
   * "rxaui"
   * "2000base-x",
   * "2500base-x",
   * "rxaui"

+  * "xaui"
+  * "10gbase-kr" (10GBASE-KR, XFI, SFI)

 - phy-connection-type: the same as "phy-mode" property but described in the
   Devicetree Specification;
 - phy-handle: phandle, specifies a reference to a node representing a PHY
 - phy-connection-type: the same as "phy-mode" property but described in the
   Devicetree Specification;
 - phy-handle: phandle, specifies a reference to a node representing a PHY