X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=Documentation%2Fdevicetree%2Fbindings%2Fnet%2Fcpsw.txt;h=0ae06491b4302209607340a5f4b250c7ca1fe100;hb=efc499f9807bfc179c66b7c3524e30370c6fd1b1;hp=28a4781ab6d7b9d6a1ab553ed96857f0f509e250;hpb=1b3bf847977c2e5974012ddd4b25fef50967d785;p=linux-2.6-block.git

diff --git a/Documentation/devicetree/bindings/net/cpsw.txt b/Documentation/devicetree/bindings/net/cpsw.txt
index 28a4781ab6d7..0ae06491b430 100644
--- a/Documentation/devicetree/bindings/net/cpsw.txt
+++ b/Documentation/devicetree/bindings/net/cpsw.txt
@@ -45,13 +45,13 @@ Required properties:
 Optional properties:
 - dual_emac_res_vlan	: Specifies VID to be used to segregate the ports
 - mac-address		: See ethernet.txt file in the same directory
-- phy_id		: Specifies slave phy id
+- phy_id		: Specifies slave phy id (deprecated, use phy-handle)
 - phy-handle		: See ethernet.txt file in the same directory
 
 Slave sub-nodes:
 - fixed-link		: See fixed-link.txt file in the same directory
-			  Either the property phy_id, or the sub-node
-			  fixed-link can be specified
+
+Note: Exactly one of phy_id, phy-handle, or fixed-link must be specified.
 
 Note: "ti,hwmods" field is used to fetch the base address and irq
 resources from TI, omap hwmod data base during device registration.