From f550f0d1ee66217b28323d646c61734aab8554e9 Mon Sep 17 00:00:00 2001 From: speriaka Date: Fri, 10 May 2019 12:58:22 +0530 Subject: [PATCH] ipq6018: drivers: net: Fix net driver Change-Id: I23963835bd599cb49abae4640645fd0b63a634f4 Signed-off-by: speriaka --- configs/ipq6018_defconfig | 10 +++++++++- drivers/net/Makefile | 1 + drivers/net/ipq6018/ipq6018_edma.c | 4 ++-- include/configs/ipq6018.h | 3 --- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/configs/ipq6018_defconfig b/configs/ipq6018_defconfig index 8ff948cfa7..1bfca7a5a3 100644 --- a/configs/ipq6018_defconfig +++ b/configs/ipq6018_defconfig @@ -88,13 +88,21 @@ CONFIG_CMD_NET=y # 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 # CONFIG_CMD_DNS is not set # 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 # diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 78c7a373bb..b2f469e954 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -91,3 +91,4 @@ obj-$(CONFIG_QCA8075_PHY) += ipq_common/ipq_qca8075.o 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 5e8c296688..01a2f5c397 100755 --- a/drivers/net/ipq6018/ipq6018_edma.c +++ b/drivers/net/ipq6018/ipq6018_edma.c @@ -1878,7 +1878,7 @@ int ipq6018_edma_init(void *edma_board_cfg) 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 @@ int ipq6018_edma_init(void *edma_board_cfg) 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 c0357a4001..8dcceb303d 100644 --- a/include/configs/ipq6018.h +++ b/include/configs/ipq6018.h @@ -308,9 +308,6 @@ extern loff_t board_env_size; #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 /*