Hi

I'm submitting this upstream patch for the 4.14 stable branch. It fixes 10Gb ethernet ports on the MacchiatoBIN board. The patch is already included in 4.15.

Mikulas

commit 760b3843fcd88f2a46e66eec08e2e6023a425809 Author: Antoine Tenart antoine.tenart@free-electrons.com Date: Thu Sep 21 09:54:07 2017 +0200

arm64: dts: marvell: mcbin: add comphy references to Ethernet ports

This patch adds comphy phandles to the Ethernet ports in the mcbin device tree. The comphy is used to configure the serdes PHYs used by these ports.

Signed-off-by: Antoine Tenart antoine.tenart@free-electrons.com Reviewed-by: Andrew Lunn andrew@lunn.ch Signed-off-by: Gregory CLEMENT gregory.clement@free-electrons.com

--- arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 9 +++++++++ 1 file changed, 9 insertions(+)

Index: linux-4.14.20/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts =================================================================== --- linux-4.14.20.orig/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts 2018-02-22 23:43:56.000000000 +0100 +++ linux-4.14.20/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts 2018-02-22 23:43:56.000000000 +0100 @@ -227,8 +227,11 @@

&cpm_eth0 { status = "okay"; + /* Network PHY */ phy = <&phy0>; phy-mode = "10gbase-kr"; + /* Generic PHY, providing serdes lanes */ + phys = <&cpm_comphy4 0>; };

&cpm_sata0 { @@ -262,15 +265,21 @@

&cps_eth0 { status = "okay"; + /* Network PHY */ phy = <&phy8>; phy-mode = "10gbase-kr"; + /* Generic PHY, providing serdes lanes */ + phys = <&cps_comphy4 0>; };

&cps_eth1 { /* CPS Lane 0 - J5 (Gigabit RJ45) */ status = "okay"; + /* Network PHY */ phy = <&ge_phy>; phy-mode = "sgmii"; + /* Generic PHY, providing serdes lanes */ + phys = <&cps_comphy0 1>; };

&cps_pinctrl {