ARM: socfpga: dts: Drop phy-addr OF property from CV dtsi
PATCH 1/2 ARM: socfpga: dts: Drop phy-addr OF property from CV dtsi
The phy-addr property of stmmac is deprecated and the stmmac driver does not use it either. On the contrary, the driver will warn if this property is defined. Remove it.
--- arch/arm/boot/dts/socfpga_cyclone5.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm/boot/dts/socfpga_cyclone5.dtsi +0 -1
@@ -40,7 +40,6 @@ ethernet at ff702000 { phy-mode = "rgmii"; - phy-addr = <0xffffffff>; /* probe for phy addr */ status = "okay"; };
Signature · 1 line
2.7.0
PATCH 2/2 ARM: socfpga: dts: Drop gmac0 from CV dtsi
The socfpga_cyclone5.dtsi is included by all DTS files which describe boards using the Cyclone V SoC. The Cyclone V SoC has two ethernet controllers and different boards use none, one or both of them.
The /soc/ethernet at ff702000/{} node in socfpga_cyclone5.dtsi unconditionaly enabled gmac0 interface, which is clearly wrong for those boards which use gmac1 interface instead.
This patch removes the entire /soc/ethernet at ff702000/{} node from the socfpga_cyclone5.dtsi file. This is correct, since all of the board which include this file also have correct gmac0 or gmac1 node present in them. Minor correction had to be done to EBV SoCrates, which didn't define PHY mode explicitly, but inherited it from the socfpga_cyclone5.dtsi .
--- arch/arm/boot/dts/socfpga_cyclone5.dtsi | 5 ----- arch/arm/boot/dts/socfpga_cyclone5_socrates.dts | 1 + 2 files changed, 1 insertion(+), 5 deletions(-)
arch/arm/boot/dts/socfpga_cyclone5.dtsi +0 -5
@@ -38,11 +38,6 @@ cap-sd-highspeed; }; - ethernet at ff702000 { - phy-mode = "rgmii"; - status = "okay"; - }; - sysmgr at ffd08000 { cpu1-start-addr = <0xffd080c4>; };
arch/arm/boot/dts/socfpga_cyclone5_socrates.dts +1 -0
@@ -36,6 +36,7 @@ }; &gmac1 { + phy-mode = "rgmii"; status = "okay"; };
Signature · 1 line
2.7.0
PATCH 2/2 ARM: socfpga: dts: Drop gmac0 from CV dtsi
Hi!
Quoted 42 lines · Marek Vasut
The
socfpga_cyclone5.dtsiis included by all DTS files which describe boards using the Cyclone V SoC. The Cyclone V SoC has two ethernet controllers and different boards use none, one or both of them.The /soc/ethernet at ff702000/{} node in
socfpga_cyclone5.dtsiunconditionaly enabled gmac0 interface, which is clearly wrong for those boards which use gmac1 interface instead.This patch removes the entire /soc/ethernet at ff702000/{} node from the
socfpga_cyclone5.dtsifile. This is correct, since all of the board which include this file also have correct gmac0 or gmac1 node present in them. Minor correction had to be done to EBV SoCrates, which didn't define PHY mode explicitly, but inherited it from thesocfpga_cyclone5.dtsi.Signed-off-by Marek Vasut <[email protected]>Cc Dinh Nguyen <[email protected]>--- arch/arm/boot/dts/socfpga_cyclone5.dtsi | 5 ----- arch/arm/boot/dts/socfpga_cyclone5_socrates.dts | 1 + 2 files changed, 1 insertion(+), 5 deletions(-)arch/arm/boot/dts/socfpga_cyclone5.dtsi +0
-5@@ -38,11 +38,6 @@ cap-sd-highspeed; }; - ethernet at ff702000 { - phy-mode = "rgmii"; - status = "okay"; - }; - sysmgr at ffd08000 { cpu1-start-addr = <0xffd080c4>; };arch/arm/boot/dts/socfpga_cyclone5_socrates.dts +0
-0
arch/arm/boot/dts/socfpga_cyclone5_socrates.dts line 41
Quoted 6 lines
arch/arm/boot/dts/socfpga_cyclone5_socrates.dts +1
-0@@ -36,6 +36,7 @@ }; &gmac1 { + phy-mode = "rgmii"; status = "okay"; };
Looks good to me.
Regards,
Steffen
Signature · 4 lines
Pengutronix e.K. | Steffen Trumtrar | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
PATCH 2/2 ARM: socfpga: dts: Drop gmac0 from CV dtsi
In reply to Marek VasutQuoted 14 lines · Marek Vasut
The
socfpga_cyclone5.dtsiis included by all DTS files which describe boards using the Cyclone V SoC. The Cyclone V SoC has two ethernet controllers and different boards use none, one or both of them.The /soc/ethernet at ff702000/{} node in
socfpga_cyclone5.dtsiunconditionaly enabled gmac0 interface, which is clearly wrong for those boards which use gmac1 interface instead.This patch removes the entire /soc/ethernet at ff702000/{} node from the
socfpga_cyclone5.dtsifile. This is correct, since all of the board which include this file also have correct gmac0 or gmac1 node present in them. Minor correction had to be done to EBV SoCrates, which didn't define PHY mode explicitly, but inherited it from thesocfpga_cyclone5.dtsi.
Quoted 7 lines
Signed-off-by Marek Vasut <[email protected]>Cc Dinh Nguyen <[email protected]>--- arch/arm/boot/dts/socfpga_cyclone5.dtsi | 5 ----- arch/arm/boot/dts/socfpga_cyclone5_socrates.dts | 1 + 2 files changed, 1 insertion(+), 5 deletions(-)
Both patches applied!
Thanks,
Dinh