Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorri...

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / net / keystone-netcp.txt

diff --git a/Documentation/devicetree/bindings/net/keystone-netcp.txt b/Documentation/devicetree/bindings/net/keystone-netcp.txt
index 04ba1dc34fd62150ae1357e8c0c7804907f56313..3a65aabc76a247eb420746b542b31515fdb96725 100644 (file)
--- a/Documentation/devicetree/bindings/net/keystone-netcp.txt
+++ b/Documentation/devicetree/bindings/net/keystone-netcp.txt
@@ -135,14 +135,14 @@ Optional properties:
                are swapped.  The netcp driver will swap the two DWORDs
                back to the proper order when this property is set to 2
                when it obtains the mac address from efuse.
-- local-mac-address:   the driver is designed to use the of_get_mac_address api
-                       only if efuse-mac is 0. When efuse-mac is 0, the MAC
-                       address is obtained from local-mac-address. If this
-                       attribute is not present, then the driver will use a
-                       random MAC address.
 - "netcp-device label":        phandle to the device specification for each of NetCP
                        sub-module attached to this interface.
 
+The MAC address will be determined using the optional properties defined in
+ethernet.txt, as provided by the of_get_mac_address API and only if efuse-mac
+is set to 0. If any of the optional MAC address properties are not present,
+then the driver will use random MAC address.
+
 Example binding:
 
 netcp: netcp@2000000 {