Skip to contentSkip to conversation

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

PATCH New Marek Vasut 2 participants 3 messages Aug 10, 2015 – Aug 18, 2015 Arm (32-bit)

lore
Share & tools
lore

Marek Vasut

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 arch/arm/dts/socfpga_cyclone5.dtsi         | 6 ------
 arch/arm/dts/socfpga_cyclone5_socrates.dts | 1 +
 2 files changed, 1 insertion(+), 6 deletions(-)
arch/arm/dts/socfpga_cyclone5.dtsi +0 -6
index 234a901..de36209 100644
@@ -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>;
 		};
arch/arm/dts/socfpga_cyclone5_socrates.dts +1 -0
index 3c98558..6782691 100644
@@ -23,6 +23,7 @@
 
 &gmac1 {
 	status = "okay";
+	phy-mode = "rgmii";
 };
 
 &i2c0 {
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 arm: socfpga: Do not enable gmac1 in Cyclone V dtsi

Quoted 7 lines · Marek Vasut

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.

Quoted 6 lines
Signed-off-by Marek Vasut <[email protected]>
---
 arch/arm/dts/socfpga_cyclone5.dtsi         | 6 ------
 arch/arm/dts/socfpga_cyclone5_socrates.dts | 1 +
 2 files changed, 1 insertion(+), 6 deletions(-)
Acked-by Dinh Nguyen <[email protected]>

Thanks,
Dinh

author
#2 lore raw

PATCH 1/1 arm: socfpga: Do not enable gmac1 in Cyclone V dtsi

Quoted 8 lines · Dinh Nguyen
Quoted 7 lines · Marek Vasut

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.

Quoted 8 lines
Quoted 6 lines
Signed-off-by Marek Vasut <[email protected]>

---

 arch/arm/dts/socfpga_cyclone5.dtsi         | 6 ------
 arch/arm/dts/socfpga_cyclone5_socrates.dts | 1 +
 2 files changed, 1 insertion(+), 6 deletions(-)
Acked-by Dinh Nguyen <[email protected]>

Applied to u-boot-socfpga/master, thanks!

Best regards,
Marek Vasut