Merge "ipq806x: Added gmac cfg and gpio entry for AP160_2xx board"
diff --git a/arch/arm/dts/ipq806x-ap160_2xx.dts b/arch/arm/dts/ipq806x-ap160_2xx.dts
index 0a72faf..cee92ff 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 ef343a2..bd90cf7 100644
--- a/board/qca/arm/ipq806x/ipq806x.c
+++ b/board/qca/arm/ipq806x/ipq806x.c
@@ -372,7 +372,6 @@
ipq_register_switch(ipq_athrs17_init);
break;
}
- ipq_register_switch(ipq_athrs17_init);
status = ipq_gmac_init(gmac_cfg);
return status;