diff mbox series

ARM: dts: BCM53573: Fix Ethernet info for Luxul devices

Message ID 20230713111145.14864-1-zajec5@gmail.com (mailing list archive)
State New, archived
Headers show
Series ARM: dts: BCM53573: Fix Ethernet info for Luxul devices | expand

Commit Message

Rafał Miłecki July 13, 2023, 11:11 a.m. UTC 
From: Rafał Miłecki <rafal@milecki.pl>

Both Luxul's XAP devices (XAP-810 and XAP-1440) are access points that
use a non-default design. They don't include switch but have a single
Ethernet port and BCM54210E PHY connected to the Ethernet controller's
MDIO bus.

Support for those devices regressed due to two changes:

1. Describing MDIO bus with switch
After commit 9fb90ae6cae7 ("ARM: dts: BCM53573: Describe on-SoC BCM53125
rev 4 switch") Linux stopped probing for MDIO devices.

2. Dropping hardcoded BCM54210E delays
In commit fea7fda7f50a ("net: phy: broadcom: Fix RGMII delays
configuration for BCM54210E") support for other PHY modes was added but
that requires a proper "phy-mode" value in DT.

Both above changes are correct (they don't need to be reverted or
anything) but they need this fix for DT data to be correct and for Linux
to work properly.

Fixes: 9fb90ae6cae7 ("ARM: dts: BCM53573: Describe on-SoC BCM53125 rev 4 switch")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
 .../boot/dts/broadcom/bcm47189-luxul-xap-1440.dts   | 13 +++++++++++++
 .../boot/dts/broadcom/bcm47189-luxul-xap-810.dts    | 13 +++++++++++++
 2 files changed, 26 insertions(+)

Comments

Florian Fainelli July 21, 2023, 4:58 p.m. UTC | #1 
From: Florian Fainelli <f.fainelli@gmail.com>

On Thu, 13 Jul 2023 13:11:45 +0200, Rafał Miłecki <zajec5@gmail.com> wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
> 
> Both Luxul's XAP devices (XAP-810 and XAP-1440) are access points that
> use a non-default design. They don't include switch but have a single
> Ethernet port and BCM54210E PHY connected to the Ethernet controller's
> MDIO bus.
> 
> Support for those devices regressed due to two changes:
> 
> 1. Describing MDIO bus with switch
> After commit 9fb90ae6cae7 ("ARM: dts: BCM53573: Describe on-SoC BCM53125
> rev 4 switch") Linux stopped probing for MDIO devices.
> 
> 2. Dropping hardcoded BCM54210E delays
> In commit fea7fda7f50a ("net: phy: broadcom: Fix RGMII delays
> configuration for BCM54210E") support for other PHY modes was added but
> that requires a proper "phy-mode" value in DT.
> 
> Both above changes are correct (they don't need to be reverted or
> anything) but they need this fix for DT data to be correct and for Linux
> to work properly.
> 
> Fixes: 9fb90ae6cae7 ("ARM: dts: BCM53573: Describe on-SoC BCM53125 rev 4 switch")
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
> ---

Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dts b/arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dts
index b9dd50844419..0f6d7fe30068 100644
--- a/arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dts
@@ -45,3 +45,16 @@  button-restart {
 		};
 	};
 };
+
+&gmac0 {
+	phy-mode = "rgmii";
+	phy-handle = <&bcm54210e>;
+
+	mdio {
+		/delete-node/ switch@1e;
+
+		bcm54210e: ethernet-phy@0 {
+			reg = <0>;
+		};
+	};
+};
diff --git a/arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-810.dts b/arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-810.dts
index cb22ae2a02e5..4e0ef0af726f 100644
--- a/arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-810.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-810.dts
@@ -81,3 +81,16 @@  pcie0_chipcommon: chipcommon@0 {
 		};
 	};
 };
+
+&gmac0 {
+	phy-mode = "rgmii";
+	phy-handle = <&bcm54210e>;
+
+	mdio {
+		/delete-node/ switch@1e;
+
+		bcm54210e: ethernet-phy@0 {
+			reg = <0>;
+		};
+	};
+};