net: ethernet: xilinx: Remove unnecessary phy defines

Phy related defines are defined in the xilinx_phy.h
file. This patch removes these phy defines from the
driver and uses the defines available in the common
header file(i.e xilinx_phy.h)

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

diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet.h b/drivers/net/ethernet/xilinx/xilinx_axienet.h
index 5d220e5a7da482d487cfb9211780cef1ee5422e8..2164737fc26295e1ee34e6df413e3405f34aa9c9 100644 (file)
--- a/drivers/net/ethernet/xilinx/xilinx_axienet.h
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet.h
@@ -336,15 +336,7 @@
 
 #define XAE_MDIO_DIV_DFT               29 /* Default MDIO clock divisor */
 
-/* Defines for different options for C_PHY_TYPE parameter in Axi Ethernet IP */
-#define XAE_PHY_TYPE_MII               0
-#define XAE_PHY_TYPE_GMII              1
-#define XAE_PHY_TYPE_RGMII_1_3         2
-#define XAE_PHY_TYPE_RGMII_2_0         3
-#define XAE_PHY_TYPE_SGMII             4
-#define XAE_PHY_TYPE_1000BASE_X                5
-
- /* Total number of entries in the hardware multicast table. */
+/* Total number of entries in the hardware multicast table. */
 #define XAE_MULTICAST_CAM_TABLE_NUM    4
 
 /* Axi Ethernet Synthesis features */

diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index a99e8965e63bede51e57e2a1a3d0bdac0490db66..d012a347ab0b193c1c4fafeb7baf9b6bfade8355 100644 (file)
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -40,6 +40,7 @@
 #include <linux/net_tstamp.h>
 #include <linux/random.h>
 #include <net/sock.h>
+#include <linux/xilinx_phy.h>
 
 #include "xilinx_axienet.h"