From 50f0745be4996a2b13ab05fd301f9b9488592d64 Mon Sep 17 00:00:00 2001
From: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
Date: Mon, 2 Apr 2018 17:24:09 +0530
Subject: [PATCH] ipq806x: Added gmac cfg and gpio entry for AP160_2xx board

Change-Id: Id17ea3958870981aa23e695082e1719c579a2631
Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
---
 arch/arm/dts/ipq806x-ap160_2xx.dts | 18 ++++++++++++++++++
 board/qca/arm/ipq806x/ipq806x.c    |  1 -
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/arch/arm/dts/ipq806x-ap160_2xx.dts b/arch/arm/dts/ipq806x-ap160_2xx.dts
index 0a72fafcf1..cee92ff5cd 100644
--- a/arch/arm/dts/ipq806x-ap160_2xx.dts
+++ b/arch/arm/dts/ipq806x-ap160_2xx.dts
@@ -22,11 +22,29 @@
 	aliases {
 		console = "/serial@16340000";
 		nand = "/nand@1A600000";
+		gmac_gpio = "/gmac1_gpio";
 		pci0 = "/pci@1b500000";
 		pci1 = "/pci@1b700000";
 		pci2 = "/pci@1b900000";
 	};
 
+	gmac_cfg {
+		gmac_count = <1>;
+
+		gmac1_cfg {
+			base = <0x37000000>;
+			unit = <0>;
+			is_macsec = <0>;
+			mac_pwr0 = <0>;
+			mac_pwr1 = <0>;
+			mac_conn_to_phy = <0>;
+			phy_interface_type = <4>;
+			phy_address_count = <1>;
+			phy_address = <4>;
+			phy_name = "IPQ MDIO0";
+		};
+	};
+
 	pci@1b500000 {
 		pci_gpio {
 			gpio3 {
diff --git a/board/qca/arm/ipq806x/ipq806x.c b/board/qca/arm/ipq806x/ipq806x.c
index ef343a2e41..bd90cf7635 100644
--- a/board/qca/arm/ipq806x/ipq806x.c
+++ b/board/qca/arm/ipq806x/ipq806x.c
@@ -372,7 +372,6 @@ int board_eth_init(bd_t *bis)
 			ipq_register_switch(ipq_athrs17_init);
 			break;
 	}
-	ipq_register_switch(ipq_athrs17_init);
 
 	status = ipq_gmac_init(gmac_cfg);
 	return status;