Documentation: DT: Update binding doc for 10G/25G MAC

This patch updates the device-tree binding doc for
adding support for 10G/25G MAC.

Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/Documentation/devicetree/bindings/net/xilinx_axienet.txt b/Documentation/devicetree/bindings/net/xilinx_axienet.txt
index bea62058dc781448a8ec17101cc2ec3aaeac3348..578d1b5b741d8595cc23de2f69c4a8385c186b72 100644 (file)
--- a/Documentation/devicetree/bindings/net/xilinx_axienet.txt
+++ b/Documentation/devicetree/bindings/net/xilinx_axienet.txt
@@ -15,11 +15,13 @@ driver.
 For more details about mdio please refer phy.txt file in the same directory.
 
 Required properties:
+<<<<<<< HEAD
 - compatible   : Must be one of "xlnx,axi-ethernet-1.00.a",
                  "xlnx,axi-ethernet-1.01.a", "xlnx,axi-ethernet-2.01.a"
                  for Axi Ethenret 1G MAC
                  controllers and "xlnx,ten-gig-eth-mac" for Axi
-                 Ethernet 10G MAC controllers.
+                 Ethernet 10G MAC controllers and
+                 "xlnx,xxv-ethernet-1.0" for 10G/25G MAC.
 - reg          : Address and length of the IO space.
 - interrupts   : Should be a list of two interrupt, TX and RX.
 - interrupt-parent     : Must be core interrupt controller.