瀏覽代碼

arm: socfpga: Do not enable gmac1 in Cyclone V dtsi

The GMAC which is enabled is purely board property, so do not enable
arbitrary GMAC in DT include files. Same goes for PHY mode, which is
again a board property. The CycloneV SoCDK does this correctly, but
SoCrates doesn't. This bug never manifested itself though, since all
the boards ever used the GMAC1 . This bug manifests itself only on
boards that utilise GMAC0.

Signed-off-by: Marek Vasut <marex@denx.de>
Marek Vasut 9 年之前
父節點
當前提交
c2624240dd
共有 2 個文件被更改,包括 1 次插入6 次删除
  1. 0 6
      arch/arm/dts/socfpga_cyclone5.dtsi
  2. 1 0
      arch/arm/dts/socfpga_cyclone5_socrates.dts

+ 0 - 6
arch/arm/dts/socfpga_cyclone5.dtsi

@@ -27,12 +27,6 @@
 			cap-sd-highspeed;
 		};
 
-		ethernet@ff702000 {
-			phy-mode = "rgmii";
-			phy-addr = <0xffffffff>; /* probe for phy addr */
-			status = "okay";
-		};
-
 		sysmgr@ffd08000 {
 			cpu1-start-addr = <0xffd080c4>;
 		};

+ 1 - 0
arch/arm/dts/socfpga_cyclone5_socrates.dts

@@ -23,6 +23,7 @@
 
 &gmac1 {
 	status = "okay";
+	phy-mode = "rgmii";
 };
 
 &i2c0 {