[U-Boot] [PATCH] arm: socfpga: Do not enable gmac1 in Cyclone V dtsi

Marek Vasut
2015-08-10T23:03:00Z

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>
---
arch/arm/dts/socfpga_cyclone5.dtsi | 6 ------
arch/arm/dts/socfpga_cyclone5_socrates.dts | 1 +
2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/arch/arm/dts/socfpga_cyclone5.dtsi b/arch/arm/dts/socfpga_cyclone5.dtsi
index 234a901..de36209 100644
--- a/arch/arm/dts/socfpga_cyclone5.dtsi
+++ b/arch/arm/dts/socfpga_cyclone5.dtsi
@@ -27,12 +27,6 @@
cap-sd-highspeed;
};

- ethernet at ff702000 {
- phy-mode = "rgmii";
- phy-addr = <0xffffffff>; /* probe for phy addr */
- status = "okay";
- };
-
sysmgr at ffd08000 {
cpu1-start-addr = <0xffd080c4>;
};
diff --git a/arch/arm/dts/socfpga_cyclone5_socrates.dts b/arch/arm/dts/socfpga_cyclone5_socrates.dts
index 3c98558..6782691 100644
--- a/arch/arm/dts/socfpga_cyclone5_socrates.dts
+++ b/arch/arm/dts/socfpga_cyclone5_socrates.dts
@@ -23,6 +23,7 @@

&gmac1 {
status = "okay";
+ phy-mode = "rgmii";
};

&i2c0 {
--
2.1.4