aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2017-09-07 11:09:59 +0300
committerDavid S. Miller <davem@davemloft.net>2017-09-08 20:49:42 -0700
commitc43593d81ab59b8ad24ee5545e098e30f742d461 (patch)
tree7e1f4c5379213e770664a7892624a3d31c52eed3 /Documentation
parentip6_tunnel: fix setting hop_limit value for ipv6 tunnel (diff)
downloadlinux-dev-c43593d81ab59b8ad24ee5545e098e30f742d461.tar.xz
linux-dev-c43593d81ab59b8ad24ee5545e098e30f742d461.zip
dt-bindings: net: don't confuse with generic PHY property
This complements commit 9a94b3a4bd (dt-binding: phy: don't confuse with Ethernet phy properties). The generic PHY 'phys' property sometime appears in the same node with the Ethernet PHY 'phy' or 'phy-handle' properties. Add a warning in ethernet.txt to reduce confusion. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/net/ethernet.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/net/ethernet.txt b/Documentation/devicetree/bindings/net/ethernet.txt
index 7da86f22a13b..2974e63ba311 100644
--- a/Documentation/devicetree/bindings/net/ethernet.txt
+++ b/Documentation/devicetree/bindings/net/ethernet.txt
@@ -1,5 +1,9 @@
The following properties are common to the Ethernet controllers:
+NOTE: All 'phy*' properties documented below are Ethernet specific. For the
+generic PHY 'phys' property, see
+Documentation/devicetree/bindings/phy/phy-bindings.txt.
+
- local-mac-address: array of 6 bytes, specifies the MAC address that was
assigned to the network device;
- mac-address: array of 6 bytes, specifies the MAC address that was last used by