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 910d1bf2c68fa1d7dcde0316cb91f62758407e8d Author: Antoine Tenart antoine.tenart@free-electrons.com Date: Mon Sep 18 09:58:09 2017 +0200
arm64: dts: marvell: add comphy nodes on cp110 master and slave
This patch describes the comphy available in the cp110 master and slave. This comphy provides serdes lanes used by various controllers such as the network one.
Signed-off-by: Antoine Tenart antoine.tenart@free-electrons.com Signed-off-by: Gregory CLEMENT gregory.clement@free-electrons.com
--- arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 38 +++++++++++++++++++ arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 38 +++++++++++++++++++ 2 files changed, 76 insertions(+)
Index: linux-4.14.20/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi =================================================================== --- linux-4.14.20.orig/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi 2018-02-22 23:50:19.000000000 +0100 +++ linux-4.14.20/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi 2018-02-22 23:50:19.000000000 +0100 @@ -111,6 +111,44 @@ }; };
+ cpm_comphy: phy@120000 { + compatible = "marvell,comphy-cp110"; + reg = <0x120000 0x6000>; + marvell,system-controller = <&cpm_syscon0>; + #address-cells = <1>; + #size-cells = <0>; + + cpm_comphy0: phy@0 { + reg = <0>; + #phy-cells = <1>; + }; + + cpm_comphy1: phy@1 { + reg = <1>; + #phy-cells = <1>; + }; + + cpm_comphy2: phy@2 { + reg = <2>; + #phy-cells = <1>; + }; + + cpm_comphy3: phy@3 { + reg = <3>; + #phy-cells = <1>; + }; + + cpm_comphy4: phy@4 { + reg = <4>; + #phy-cells = <1>; + }; + + cpm_comphy5: phy@5 { + reg = <5>; + #phy-cells = <1>; + }; + }; + cpm_mdio: mdio@12a200 { #address-cells = <1>; #size-cells = <0>; Index: linux-4.14.20/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi =================================================================== --- linux-4.14.20.orig/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi 2018-02-22 23:50:19.000000000 +0100 +++ linux-4.14.20/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi 2018-02-22 23:50:19.000000000 +0100 @@ -111,6 +111,44 @@ }; };
+ cps_comphy: phy@120000 { + compatible = "marvell,comphy-cp110"; + reg = <0x120000 0x6000>; + marvell,system-controller = <&cps_syscon0>; + #address-cells = <1>; + #size-cells = <0>; + + cps_comphy0: phy@0 { + reg = <0>; + #phy-cells = <1>; + }; + + cps_comphy1: phy@1 { + reg = <1>; + #phy-cells = <1>; + }; + + cps_comphy2: phy@2 { + reg = <2>; + #phy-cells = <1>; + }; + + cps_comphy3: phy@3 { + reg = <3>; + #phy-cells = <1>; + }; + + cps_comphy4: phy@4 { + reg = <4>; + #phy-cells = <1>; + }; + + cps_comphy5: phy@5 { + reg = <5>; + #phy-cells = <1>; + }; + }; + cps_mdio: mdio@12a200 { #address-cells = <1>; #size-cells = <0>;