Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / net / fsl-tsec-phy.txt

diff --git a/Documentation/devicetree/bindings/net/fsl-tsec-phy.txt b/Documentation/devicetree/bindings/net/fsl-tsec-phy.txt
index 594982c6b9f9e2846163afa654f208ed74e888e1..79bf352e659cd1b999603317a62a7ec62fbac0b6 100644 (file)
--- a/Documentation/devicetree/bindings/net/fsl-tsec-phy.txt
+++ b/Documentation/devicetree/bindings/net/fsl-tsec-phy.txt
@@ -6,7 +6,11 @@ the definition of the PHY node in booting-without-of.txt for an example
 of how to define a PHY.
 
 Required properties:
-  - reg : Offset and length of the register set for the device
+  - reg : Offset and length of the register set for the device, and optionally
+          the offset and length of the TBIPA register (TBI PHY address
+         register).  If TBIPA register is not specified, the driver will
+         attempt to infer it from the register set specified (your mileage may
+         vary).
   - compatible : Should define the compatible device type for the
     mdio. Currently supported strings/devices are:
        - "fsl,gianfar-tbi"