diff mbox series

arm: dts: mediatek: convert gmac link mode to 2500base-x for r3

Message ID 20230803165258.14744-1-linux@fw-web.de
State Accepted
Delegated to: Tom Rini
Headers show
Series arm: dts: mediatek: convert gmac link mode to 2500base-x for r3 | expand

Commit Message

Frank Wunderlich Aug. 3, 2023, 4:52 p.m. UTC
From: Frank Wunderlich <frank-w@public-files.de>

Ethernet on Bananapi-r3 is broken after

commit bd70f3cea353 ("net: mediatek: add support for SGMII 1Gbps auto-negotiation mode")

because changes from this commit were not applied to bpi-r3 devicetree too:

commit aef54ea16cac ("arm: dts: medaitek: convert gmac link mode to 2500base-x")

Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
---
 arch/arm/dts/mt7986a-bpi-r3-sd.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Weijie Gao (高惟杰) Aug. 4, 2023, 9:48 a.m. UTC | #1
On Thu, 2023-08-03 at 18:52 +0200, Frank Wunderlich wrote:
> From: Frank Wunderlich <frank-w@public-files.de>
> 
> Ethernet on Bananapi-r3 is broken after
> 
> commit bd70f3cea353 ("net: mediatek: add support for SGMII 1Gbps
> auto-negotiation mode")
> 
> because changes from this commit were not applied to bpi-r3
> devicetree too:
> 
> commit aef54ea16cac ("arm: dts: medaitek: convert gmac link mode to
> 2500base-x")
> 
> Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
> ---

Reviewed-by: Weijie Gao <weijie.gao@mediatek.com>
Tom Rini Aug. 18, 2023, 5:49 p.m. UTC | #2
On Thu, Aug 03, 2023 at 06:52:58PM +0200, Frank Wunderlich wrote:

> From: Frank Wunderlich <frank-w@public-files.de>
> 
> Ethernet on Bananapi-r3 is broken after
> 
> commit bd70f3cea353 ("net: mediatek: add support for SGMII 1Gbps auto-negotiation mode")
> 
> because changes from this commit were not applied to bpi-r3 devicetree too:
> 
> commit aef54ea16cac ("arm: dts: medaitek: convert gmac link mode to 2500base-x")
> 
> Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
> Reviewed-by: Weijie Gao <weijie.gao@mediatek.com>

Applied to u-boot/next, thanks!
Frank Wunderlich Aug. 18, 2023, 6:45 p.m. UTC | #3
Am 18. August 2023 19:49:45 MESZ schrieb Tom Rini <trini@konsulko.com>:
>On Thu, Aug 03, 2023 at 06:52:58PM +0200, Frank Wunderlich wrote:
>
>> From: Frank Wunderlich <frank-w@public-files.de>
>> 
>> Ethernet on Bananapi-r3 is broken after
>> 
>> commit bd70f3cea353 ("net: mediatek: add support for SGMII 1Gbps auto-negotiation mode")
>> 
>> because changes from this commit were not applied to bpi-r3 devicetree too:
>> 
>> commit aef54ea16cac ("arm: dts: medaitek: convert gmac link mode to 2500base-x")
>> 
>> Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
>> Reviewed-by: Weijie Gao <weijie.gao@mediatek.com>
>
>Applied to u-boot/next, thanks!
>
>-- 
>Tom

Thx,but this leaves ethernet broken on 2023.10 for r3...could this be added to this release too?

regards Frank
Tom Rini Aug. 18, 2023, 6:47 p.m. UTC | #4
On Fri, Aug 18, 2023 at 08:45:33PM +0200, Frank Wunderlich wrote:
> Am 18. August 2023 19:49:45 MESZ schrieb Tom Rini <trini@konsulko.com>:
> >On Thu, Aug 03, 2023 at 06:52:58PM +0200, Frank Wunderlich wrote:
> >
> >> From: Frank Wunderlich <frank-w@public-files.de>
> >> 
> >> Ethernet on Bananapi-r3 is broken after
> >> 
> >> commit bd70f3cea353 ("net: mediatek: add support for SGMII 1Gbps auto-negotiation mode")
> >> 
> >> because changes from this commit were not applied to bpi-r3 devicetree too:
> >> 
> >> commit aef54ea16cac ("arm: dts: medaitek: convert gmac link mode to 2500base-x")
> >> 
> >> Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
> >> Reviewed-by: Weijie Gao <weijie.gao@mediatek.com>
> >
> >Applied to u-boot/next, thanks!
> >
> >-- 
> >Tom
> 
> Thx,but this leaves ethernet broken on 2023.10 for r3...could this be added to this release too?

Ah, OK, I'll grab it for master too then, thanks.  FWIW, some Fixes tags
would have made it more clear as those stand out in patchwork.
Tom Rini Aug. 29, 2023, 2:09 p.m. UTC | #5
On Thu, Aug 03, 2023 at 06:52:58PM +0200, Frank Wunderlich wrote:

> From: Frank Wunderlich <frank-w@public-files.de>
> 
> Ethernet on Bananapi-r3 is broken after
> 
> commit bd70f3cea353 ("net: mediatek: add support for SGMII 1Gbps auto-negotiation mode")
> 
> because changes from this commit were not applied to bpi-r3 devicetree too:
> 
> commit aef54ea16cac ("arm: dts: medaitek: convert gmac link mode to 2500base-x")
> 
> Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
> Reviewed-by: Weijie Gao <weijie.gao@mediatek.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/arch/arm/dts/mt7986a-bpi-r3-sd.dts b/arch/arm/dts/mt7986a-bpi-r3-sd.dts
index 15256302b86b..c156a8136343 100644
--- a/arch/arm/dts/mt7986a-bpi-r3-sd.dts
+++ b/arch/arm/dts/mt7986a-bpi-r3-sd.dts
@@ -76,12 +76,12 @@ 
 &eth {
 	status = "okay";
 	mediatek,gmac-id = <0>;
-	phy-mode = "sgmii";
+	phy-mode = "2500base-x";
 	mediatek,switch = "mt7531";
 	reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
 
 	fixed-link {
-		speed = <1000>;
+		speed = <2500>;
 		full-duplex;
 	};
 };