From f648fe073e0f7c8f66140c76a13ffa984ae45300 Mon Sep 17 00:00:00 2001
From: Guo Ren <guoren@linux.alibaba.com>
Date: Fri, 19 Jun 2020 07:36:17 +0000
Subject: [PATCH] package/hw-c860: Disable 860 fpga test and correct an.dts.txt

Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
---
 .gitlab-ci.yml                | 24 +++++++++----------
 package/hw-c860/hw/an.dts.txt | 44 ++++++++++++++++++++++++++++++-----
 2 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 844c54278c..087c2115ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -394,20 +394,20 @@ wait_for_trigger:
     <<: *860_qemu_test
 
 # fpga
-.860_fpga_before_test: &860_fpga_before_test
-    - RUN="run_test_fpga.sh"
+# .860_fpga_before_test: &860_fpga_before_test
+#    - RUN="run_test_fpga.sh"
 
-.860_fpga_test: &860_fpga_test
-    stage: chip-test
-    before_script: *860_fpga_before_test
-    <<: *common_tests
+# .860_fpga_test: &860_fpga_test
+#    stage: chip-test
+#    before_script: *860_fpga_before_test
+#    <<: *common_tests
 
-860_4.9_glibc_fpga_test:
-    tags:
-      - csky-860-fpga
-    dependencies:
-      - 860_4.9_glibc_compat
-    <<: *860_fpga_test
+# 860_4.9_glibc_fpga_test:
+#    tags:
+#      - csky-860-fpga
+#    dependencies:
+#      - 860_4.9_glibc_compat
+#    <<: *860_fpga_test
 
 # chip test
 .an_chip_before_test: &an_chip_before_test
diff --git a/package/hw-c860/hw/an.dts.txt b/package/hw-c860/hw/an.dts.txt
index d67b14506b..b190163f45 100644
--- a/package/hw-c860/hw/an.dts.txt
+++ b/package/hw-c860/hw/an.dts.txt
@@ -98,17 +98,49 @@
 			reg-io-width = <4>;
 		};
 
-		gmac: ethernet@FFFC0000 {
-			compatible = "snps,dwmac";
-			reg = <0xfffc0000 0x2000>;
+		gmac_pll_out_clk: gmac_pll_out_clk {
+			#clock-cells = <0>;
+			compatible = "fixed-clock";
+			clock-frequency = <1000000000>;
+			clock-output-names = "gmac_pll_out_clk";
+		};
+
+		stmmac_axi_setup: stmmac-axi-config {
+			snps,wr_osr_lmt = <3>;
+			snps,rd_osr_lmt = <3>;
+			snps,blen = <16 8 4 0 0 0 0>;
+		};
+
+		gmac: ethernet@fffc0000 {
+			compatible = "thead,dwmac";
+			reg = < 0xfffc0000 0x2000
+				0xfe83025c 0x4
+				0xfe83031c 0x4
+				0xfff770c0 0x1c>;
+			reg-names = "gmac", "phy_if_reg", "txclk_dir_reg", "clk_mgr_reg";
 			interrupt-parent = <&intc>;
 			interrupts = <56>;
 			interrupt-names = "macirq";
-			clocks = <&dummy_ahb>;
-			clock-names = "stmmaceth";
+			clocks = <&dummy_ahb>, <&gmac_pll_out_clk>;
+			clock-names = "stmmaceth", "gmac_pll_clk";
 			snps,pbl = <32>;
 			snps,fixed-burst;
-			phy-mode = "mii";
+			snps,axi-config = <&stmmac_axi_setup>;
+
+			phy-mode = "rgmii-txid";
+			rx-clk-delay = <0x0>; /* for RGMII */
+			tx-clk-delay = <0>;    /* for RGMII */
+
+			phy-handle = <&eth_phy_0>;
+			mdio0 {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				compatible = "snps,dwmac-mdio";
+
+				eth_phy_0: ethernet-phy@0 {
+					reg = <0>;
+				};
+			};
 		};
 	};