Merge "ipq6018: fixing timer frequency"
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..27984b8 100644
--- a/include/configs/ipq6018.h
+++ b/include/configs/ipq6018.h
@@ -19,7 +19,7 @@
#endif
#define CONFIG_IPQ6018
-#define CONFIG_QCA_DISABLE_SCM
+#undef CONFIG_QCA_DISABLE_SCM
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_LATE_INIT
@@ -33,7 +33,7 @@
#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_BOOTM_LEN 0x1000000
+#define CONFIG_SYS_BOOTM_LEN 0x4000000
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SIZE_MAX (256 << 10) /* 256 KB */
@@ -108,12 +108,12 @@
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
/*
* IPQ_TFTP_MIN_ADDR: Starting address of Linux HLOS region.
- * CONFIG_TZ_END_ADDR: Ending address of Trust Zone and starting
- * address of WLAN Area.
+ * CONFIG_TZ_END_ADDR: Ending address of Trust Zone/SMEM(for ipq6018)
+ * and starting address of WLAN Area.
* TFTP file can only be written in Linux HLOS region and WLAN AREA.
*/
#define IPQ_TFTP_MIN_ADDR (CONFIG_SYS_SDRAM_BASE + (16 << 20))
-#define CONFIG_TZ_END_ADDR 0x49100000
+#define CONFIG_TZ_END_ADDR 0x4AB00000
#define CONFIG_SYS_SDRAM_END ((long long)CONFIG_SYS_SDRAM_BASE + gd->ram_size)
#ifndef __ASSEMBLY__
@@ -219,13 +219,18 @@
/*
* SPI NAND SUPPORT
*/
-#define CONFIG_IPQ6018_SPI_NAND
+#undef CONFIG_IPQ6018_SPI_NAND
#ifdef CONFIG_IPQ6018_SPI_NAND
#define CONFIG_SPI_NAND
#define CONFIG_SF_SPI_NAND_CS 1
#define CONFIG_IPQ_SPI_NAND_INFO_IDX 1
#define CONFIG_SF_NAND_BUS 1
#define CONFIG_SPI_NAND_MULTI_BYTE_READ_ID
+#define CONFIG_IPQ_MAX_SPI_DEVICE 2
+#define CONFIG_IPQ_SPI_NOR_INFO_IDX 2
+#else
+#define CONFIG_IPQ_MAX_SPI_DEVICE 1
+#define CONFIG_IPQ_SPI_NOR_INFO_IDX 1
#endif
/*
@@ -236,10 +241,8 @@
CONFIG_IPQ_MAX_SPI_DEVICE
#define CONFIG_IPQ_MAX_NAND_DEVICE 1
-#define CONFIG_IPQ_MAX_SPI_DEVICE 2
#define CONFIG_QPIC_NAND_NAND_INFO_IDX 0
-#define CONFIG_IPQ_SPI_NOR_INFO_IDX 2
#define CONFIG_NAND_FLASH_INFO_IDX CONFIG_QPIC_NAND_NAND_INFO_IDX
#define CONFIG_SPI_FLASH_INFO_IDX CONFIG_IPQ_SPI_NOR_INFO_IDX
@@ -308,9 +311,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
/*