From f49ac7e1c4107b88f30ab34b039e1c7ebff2d469 Mon Sep 17 00:00:00 2001
From: Jakov Petrina <jakov.petrina@sartura.hr>
Date: Fri, 24 Apr 2020 11:24:08 +0200
Subject: arm: dts: uDPU: switch default PHY speed to 3.125Gbit

This resolves issues with certain SFP modules.

Signed-off-by: Jakov Petrina <jakov.petrina@sartura.hr>
Signed-off-by: Vladimir Vid <vladimir.vid@sartura.hr>
Reviewed-by: Stefan Roese <sr@denx.de>
---
 arch/arm/dts/armada-3720-uDPU.dts | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/arch/arm/dts/armada-3720-uDPU.dts b/arch/arm/dts/armada-3720-uDPU.dts
index 683dac2a7c..07c7b91175 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 {
-- 
cgit v1.2.3


From b40745e5c29a45ebe7efce53a1e3ba751d0ef351 Mon Sep 17 00:00:00 2001
From: Joel Johnson <mrjoel@lixil.net>
Date: Sat, 25 Apr 2020 20:54:56 -0600
Subject: cmd: mvebu: bubt: fix quoted string split across lines

Update quoted string alignment to address checkpatch.pl warning
originally introduced in
commit f60a66ef5d7d ("cmd: mvebu: bubt: show image boot device").

Signed-off-by: Joel Johnson <mrjoel@lixil.net>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
 cmd/mvebu/bubt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index dc0ce01c35..ef53153c46 100644
--- a/cmd/mvebu/bubt.c
+++ b/cmd/mvebu/bubt.c
@@ -730,8 +730,8 @@ static int bubt_check_boot_mode(const struct bubt_dev *dst)
 
 		for (int i = 0; i < ARRAY_SIZE(a38x_boot_modes); i++) {
 			if (a38x_boot_modes[i].id == hdr->blockid) {
-				printf("Error: A38x image meant to be "
-				       "booted from \"%s\", not \"%s\"!\n",
+				printf("Error: A38x image meant to be booted from "
+				       "\"%s\", not \"%s\"!\n",
 				       a38x_boot_modes[i].name, dst->name);
 				return -ENOEXEC;
 			}
-- 
cgit v1.2.3