diff mbox series

ARM: dts: armada388-clearfog: add missing phy-modes

Message ID E1pxmNQ-0034DX-Jo@rmk-PC.armlinux.org.uk
State Accepted
Commit e5cfa586d5131979feed2820dee18689a4075e64
Headers show
Series ARM: dts: armada388-clearfog: add missing phy-modes | expand

Commit Message

Russell King (Oracle) May 13, 2023, 10:21 a.m. UTC 
The DSA framework has got more picky about always having a phy-mode,
particularly for the CPU port. Add the missing phy-mode properties
for every port which does not have an integrated PHY.

Add a phy-mode property to the ethernet interface facing the switch
as this was configured using SGMII - as the switch is actually
using 1000base-x, let's have some consistency between the two link
partners.

Additionally, the cpu label has never actually been used in the
binding, so remove it.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
This continues on with Andrew's patch set from April, fixing up
SolidRun's Armada-388 based Clearfog board with a 88e6176 switch.

 arch/arm/boot/dts/armada-388-clearfog.dts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/armada-388-clearfog.dts b/arch/arm/boot/dts/armada-388-clearfog.dts
index 95299167dcf5..32c569df142f 100644
--- a/arch/arm/boot/dts/armada-388-clearfog.dts
+++ b/arch/arm/boot/dts/armada-388-clearfog.dts
@@ -47,6 +47,8 @@  button-0 {
 
 &eth1 {
 	/* ethernet@30000 */
+	phy-mode = "1000base-x";
+
 	fixed-link {
 		speed = <1000>;
 		full-duplex;
@@ -129,8 +131,9 @@  port@4 {
 
 			port@5 {
 				reg = <5>;
-				label = "cpu";
 				ethernet = <&eth1>;
+				phy-mode = "1000base-x";
+
 				fixed-link {
 					speed = <1000>;
 					full-duplex;
@@ -141,6 +144,8 @@  port@6 {
 				/* 88E1512 external phy */
 				reg = <6>;
 				label = "lan6";
+				phy-mode = "rgmii-id";
+
 				fixed-link {
 					speed = <1000>;
 					full-duplex;