ipq6018: drivers: net: Fix net driver
Change-Id: I23963835bd599cb49abae4640645fd0b63a634f4
Signed-off-by: speriaka <speriaka@codeaurora.org>
diff --git a/configs/ipq6018_defconfig b/configs/ipq6018_defconfig
index 8ff948c..1bfca7a 100644
--- a/configs/ipq6018_defconfig
+++ b/configs/ipq6018_defconfig
@@ -88,7 +88,7 @@
# CONFIG_CMD_TFTPSRV is not set
# CONFIG_CMD_RARP is not set
# CONFIG_CMD_DHCP is not set
-CONFIG_CMD_NFS=y
+# CONFIG_CMD_NFS is not set
# CONFIG_CMD_PING is not set
# CONFIG_CMD_CDP is not set
# CONFIG_CMD_SNTP is not set
@@ -96,6 +96,14 @@
# CONFIG_CMD_LINK_LOCAL is not set
#
+# Network PHY
+#
+CONFIG_QCA8075_PHY=y
+CONFIG_QCA8033_PHY=y
+CONFIG_QCA8081_PHY=y
+CONFIG_IPQ6018_QCA_AQUANTIA_PHY=y
+
+#
# Misc commands
#
# CONFIG_CMD_TIME is not set
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 78c7a37..b2f469e 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -91,3 +91,4 @@
obj-$(CONFIG_QCA8033_PHY) += ipq_common/ipq_qca8033.o
obj-$(CONFIG_QCA8081_PHY) += ipq_common/ipq_qca8081.o
obj-$(CONFIG_QCA_AQUANTIA_PHY) += ipq807x/ipq807x_aquantia_phy.o
+obj-$(CONFIG_IPQ6018_QCA_AQUANTIA_PHY) += ipq6018/ipq6018_aquantia_phy.o
diff --git a/drivers/net/ipq6018/ipq6018_edma.c b/drivers/net/ipq6018/ipq6018_edma.c
index 5e8c296..01a2f5c 100755
--- a/drivers/net/ipq6018/ipq6018_edma.c
+++ b/drivers/net/ipq6018/ipq6018_edma.c
@@ -1878,7 +1878,7 @@
ipq_qca8081_phy_init(&ipq6018_edma_dev[i]->ops[phy_id], phy_addr);
break;
#endif
-#ifdef CONFIG_QCA_AQUANTIA_PHY
+#ifdef CONFIG_IPQ6018_QCA_AQUANTIA_PHY
case AQUANTIA_PHY_107:
case AQUANTIA_PHY_109:
case AQUANTIA_PHY_111:
@@ -1886,7 +1886,7 @@
case AQUANTIA_PHY_111B0:
case AQUANTIA_PHY_112C:
ipq_board_fw_download(phy_addr);
- ipq_qca_aquantia_phy_init(&ipq807x_edma_dev[i]->ops[phy_id], phy_addr);
+ ipq_qca_aquantia_phy_init(&ipq6018_edma_dev[i]->ops[phy_id], phy_addr);
break;
#endif
default:
diff --git a/include/configs/ipq6018.h b/include/configs/ipq6018.h
index c0357a4..8dcceb3 100644
--- a/include/configs/ipq6018.h
+++ b/include/configs/ipq6018.h
@@ -308,9 +308,6 @@
#define CONFIG_SERVERIP 192.168.10.1
#define CONFIG_CMD_TFTPPUT
#define CONFIG_IPQ_MDIO 1
-#define CONFIG_QCA8075_PHY 1
-#define CONFIG_QCA8033_PHY 1
-#define CONFIG_QCA8081_PHY 1
#define CONFIG_IPQ_ETH_INIT_DEFER
/*