aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-05-04 11:05:48 -0400
committerTom Rini <trini@konsulko.com>2020-05-04 11:05:48 -0400
commita1f5f4ac20c0947afda93f9b906facfbee2708fe (patch)
treec80b3bcd8031c8613d8f7b3c8c95c3079e9d81e4 /arch
parent143414c03fa72468fa8ce0d1ded21a4a616400f9 (diff)
parentb40745e5c29a45ebe7efce53a1e3ba751d0ef351 (diff)
downloadu-boot-a1f5f4ac20c0947afda93f9b906facfbee2708fe.zip
u-boot-a1f5f4ac20c0947afda93f9b906facfbee2708fe.tar.gz
u-boot-a1f5f4ac20c0947afda93f9b906facfbee2708fe.tar.bz2
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- 2 MVEBU related fixes
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/dts/armada-3720-uDPU.dts18
1 files changed, 6 insertions, 12 deletions
diff --git a/arch/arm/dts/armada-3720-uDPU.dts b/arch/arm/dts/armada-3720-uDPU.dts
index 683dac2..07c7b91 100644
--- a/arch/arm/dts/armada-3720-uDPU.dts
+++ b/arch/arm/dts/armada-3720-uDPU.dts
@@ -109,11 +109,11 @@
&comphy {
phy0 {
phy-type = <PHY_TYPE_SGMII1>;
- phy-speed = <PHY_SPEED_1_25G>;
+ phy-speed = <PHY_SPEED_3_125G>;
};
phy1 {
phy-type = <PHY_TYPE_SGMII0>;
- phy-speed = <PHY_SPEED_1_25G>;
+ phy-speed = <PHY_SPEED_3_125G>;
};
phy2 {
@@ -125,22 +125,16 @@
&eth0 {
pinctrl-0 = <&pcie_pins>;
status = "okay";
- phy-mode = "sgmii";
+ phy-mode = "2500base-x";
+ managed = "in-band-status";
phy = <&ethphy0>;
- fixed-link {
- speed = <1000>;
- full-duplex;
- };
};
&eth1 {
status = "okay";
- phy-mode = "sgmii";
+ phy-mode = "2500base-x";
+ managed = "in-band-status";
phy = <&ethphy1>;
- fixed-link {
- speed = <1000>;
- full-duplex;
- };
};
&i2c0 {