diff options
author | MarkLee <Mark-MC.Lee@mediatek.com> | 2019-10-14 15:15:18 +0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-10-15 18:03:35 -0700 |
commit | 2618500dd370da413cb1f616111e1bd8d9f5f94f (patch) | |
tree | 486ece79e7954e36e0a1c5b875e3797bd490f918 | |
parent | 4e3eff5beafa5c97cdf2af2181f46479941a7f45 (diff) | |
download | linux-stable-2618500dd370da413cb1f616111e1bd8d9f5f94f.tar.gz linux-stable-2618500dd370da413cb1f616111e1bd8d9f5f94f.tar.bz2 linux-stable-2618500dd370da413cb1f616111e1bd8d9f5f94f.zip |
arm: dts: mediatek: Update mt7629 dts to reflect the latest dt-binding
* Removes mediatek,physpeed property from dtsi that is useless in PHYLINK
* Use the fixed-link property speed = <2500> to set the phy in 2.5Gbit.
* Set gmac1 to gmii mode that connect to a internal gphy
Signed-off-by: MarkLee <Mark-MC.Lee@mediatek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/arm/boot/dts/mt7629-rfb.dts | 13 | ||||
-rw-r--r-- | arch/arm/boot/dts/mt7629.dtsi | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/mt7629-rfb.dts b/arch/arm/boot/dts/mt7629-rfb.dts index 3621b7d2b22a..9980c10c6e29 100644 --- a/arch/arm/boot/dts/mt7629-rfb.dts +++ b/arch/arm/boot/dts/mt7629-rfb.dts @@ -66,9 +66,21 @@ pinctrl-1 = <&ephy_leds_pins>; status = "okay"; + gmac0: mac@0 { + compatible = "mediatek,eth-mac"; + reg = <0>; + phy-mode = "2500base-x"; + fixed-link { + speed = <2500>; + full-duplex; + pause; + }; + }; + gmac1: mac@1 { compatible = "mediatek,eth-mac"; reg = <1>; + phy-mode = "gmii"; phy-handle = <&phy0>; }; @@ -78,7 +90,6 @@ phy0: ethernet-phy@0 { reg = <0>; - phy-mode = "gmii"; }; }; }; diff --git a/arch/arm/boot/dts/mt7629.dtsi b/arch/arm/boot/dts/mt7629.dtsi index 9608bc2ccb3f..867b88103b9d 100644 --- a/arch/arm/boot/dts/mt7629.dtsi +++ b/arch/arm/boot/dts/mt7629.dtsi @@ -468,14 +468,12 @@ compatible = "mediatek,mt7629-sgmiisys", "syscon"; reg = <0x1b128000 0x3000>; #clock-cells = <1>; - mediatek,physpeed = "2500"; }; sgmiisys1: syscon@1b130000 { compatible = "mediatek,mt7629-sgmiisys", "syscon"; reg = <0x1b130000 0x3000>; #clock-cells = <1>; - mediatek,physpeed = "2500"; }; }; }; |