All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/9] arm64: marvell: 7k/8k: improve network support
@ 2017-09-18  7:58 Antoine Tenart
  2017-09-18  7:58 ` [PATCH 1/9] arm64: defconfig: enable the Marvell 10G PHY as a module Antoine Tenart
                   ` (8 more replies)
  0 siblings, 9 replies; 20+ messages in thread
From: Antoine Tenart @ 2017-09-18  7:58 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

This series improves the network support on Marvell 7k and 8k platforms
by adding descriptions of the comphy, and by using the comphy in already
available networking ports. The series also introduces a description of
the SFP ports on the Marvell Armada 7040-db and 8040-db.

Two defconfig patches also improve the Marvell ARM64 support by enabling
required options allowing to use the networking ports properly.

This series follows recent improvements in the PPv2 driver.

Based on v4.14-rc1, and tested on the Marvell Armada 7040-db, 8040-db
and 8040-mcbin.

Thanks!
Antoine

Antoine Tenart (8):
  arm64: defconfig: enable the Marvell 10G PHY as a module
  arm64: dts: marvell: extend the cp110 syscon register area length
  arm64: dts: marvell: add comphy nodes on cp110 master and slave
  arm64: dts: marvell: mcbin: add comphy references to Ethernet ports
  arm64: dts: marvell: 7040-db: add comphy reference to Ethernet port
  arm64: dts: marvell: cp110: add PPv2 port interrupts
  arm64: dts: marvell: 7040-db: enable the SFP port
  arm64: dts: marvell: 8040-db: enable the SFP ports

Miquel Raynal (1):
  arm64: defconfig: enable Marvell CP110 comphy

 arch/arm64/boot/dts/marvell/armada-7040-db.dts     |  7 +++
 arch/arm64/boot/dts/marvell/armada-8040-db.dts     | 10 ++++
 arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts  |  3 ++
 .../boot/dts/marvell/armada-cp110-master.dtsi      | 55 +++++++++++++++++++---
 .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 55 +++++++++++++++++++---
 arch/arm64/configs/defconfig                       |  2 +
 6 files changed, 118 insertions(+), 14 deletions(-)

-- 
2.13.5

^ permalink raw reply	[flat|nested] 20+ messages in thread
* [PATCH 1/9] arm64: defconfig: enable the Marvell 10G PHY as a module
  2017-09-18  7:58 [PATCH 0/9] arm64: marvell: 7k/8k: improve network support Antoine Tenart
@ 2017-09-18  7:58 ` Antoine Tenart
  2017-09-20 12:30   ` Gregory CLEMENT
  2017-09-18  7:58 ` [PATCH 2/9] arm64: defconfig: enable Marvell CP110 comphy Antoine Tenart
                   ` (7 subsequent siblings)
  8 siblings, 1 reply; 20+ messages in thread
From: Antoine Tenart @ 2017-09-18  7:58 UTC (permalink / raw)
  To: linux-arm-kernel

The Marvell 10G PHY is present on mvebu platforms. Enable it as a module
so that the network works on these platforms.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
---
 arch/arm64/configs/defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 34480e9af2e7..4c9d4f6692dc 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -204,6 +204,7 @@ CONFIG_STMMAC_ETH=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=y
 CONFIG_AT803X_PHY=m
 CONFIG_MARVELL_PHY=m
+CONFIG_MARVELL_10G_PHY=m
 CONFIG_MESON_GXL_PHY=m
 CONFIG_MICREL_PHY=y
 CONFIG_REALTEK_PHY=m
-- 
2.13.5

^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [PATCH 2/9] arm64: defconfig: enable Marvell CP110 comphy
  2017-09-18  7:58 [PATCH 0/9] arm64: marvell: 7k/8k: improve network support Antoine Tenart
  2017-09-18  7:58 ` [PATCH 1/9] arm64: defconfig: enable the Marvell 10G PHY as a module Antoine Tenart
@ 2017-09-18  7:58 ` Antoine Tenart
  2017-09-20 12:31   ` Gregory CLEMENT
  2017-09-18  7:58 ` [PATCH 3/9] arm64: dts: marvell: extend the cp110 syscon register area length Antoine Tenart
                   ` (6 subsequent siblings)
  8 siblings, 1 reply; 20+ messages in thread
From: Antoine Tenart @ 2017-09-18  7:58 UTC (permalink / raw)
  To: linux-arm-kernel

From: Miquel Raynal <miquel.raynal@free-electrons.com>

The comphy is an hardware block giving access to common PHYs that can be
used by various other engines (Network, SATA, ...). This is used on
Marvell 7k/8k platforms for now. Enable the corresponding driver.

Signed-off-by: Miquel Raynal <miquel.raynal@free-electrons.com>
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
---
 arch/arm64/configs/defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 4c9d4f6692dc..8495b88a0966 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -535,6 +535,7 @@ CONFIG_PWM_TEGRA=m
 CONFIG_PHY_RCAR_GEN3_USB2=y
 CONFIG_PHY_HI6220_USB=y
 CONFIG_PHY_SUN4I_USB=y
+CONFIG_PHY_MVEBU_CP110_COMPHY=y
 CONFIG_PHY_ROCKCHIP_INNO_USB2=y
 CONFIG_PHY_ROCKCHIP_EMMC=y
 CONFIG_PHY_ROCKCHIP_PCIE=m
-- 
2.13.5

^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [PATCH 3/9] arm64: dts: marvell: extend the cp110 syscon register area length
  2017-09-18  7:58 [PATCH 0/9] arm64: marvell: 7k/8k: improve network support Antoine Tenart
  2017-09-18  7:58 ` [PATCH 1/9] arm64: defconfig: enable the Marvell 10G PHY as a module Antoine Tenart
  2017-09-18  7:58 ` [PATCH 2/9] arm64: defconfig: enable Marvell CP110 comphy Antoine Tenart
@ 2017-09-18  7:58 ` Antoine Tenart
  2017-09-20 12:46   ` Gregory CLEMENT
  2017-09-18  7:58 ` [PATCH 4/9] arm64: dts: marvell: add comphy nodes on cp110 master and slave Antoine Tenart
                   ` (5 subsequent siblings)
  8 siblings, 1 reply; 20+ messages in thread
From: Antoine Tenart @ 2017-09-18  7:58 UTC (permalink / raw)
  To: linux-arm-kernel

This patch extends on both cp110 the system register area length to
include some of the comphy registers as well.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
---
 arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 2 +-
 arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
index 8263a8a504a8..faf7d4a497aa 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
@@ -143,7 +143,7 @@
 
 			cpm_syscon0: system-controller at 440000 {
 				compatible = "syscon", "simple-mfd";
-				reg = <0x440000 0x1000>;
+				reg = <0x440000 0x2000>;
 
 				cpm_clk: clock {
 					compatible = "marvell,cp110-clock";
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
index b71ee6c83668..02d6e2f1a7bf 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
@@ -143,7 +143,7 @@
 
 			cps_syscon0: system-controller at 440000 {
 				compatible = "syscon", "simple-mfd";
-				reg = <0x440000 0x1000>;
+				reg = <0x440000 0x2000>;
 
 				cps_clk: clock {
 					compatible = "marvell,cp110-clock";
-- 
2.13.5

^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [PATCH 4/9] arm64: dts: marvell: add comphy nodes on cp110 master and slave
  2017-09-18  7:58 [PATCH 0/9] arm64: marvell: 7k/8k: improve network support Antoine Tenart
                   ` (2 preceding siblings ...)
  2017-09-18  7:58 ` [PATCH 3/9] arm64: dts: marvell: extend the cp110 syscon register area length Antoine Tenart
@ 2017-09-18  7:58 ` Antoine Tenart
  2017-09-20 12:47   ` Gregory CLEMENT
  2017-09-18  7:58 ` [PATCH 5/9] arm64: dts: marvell: mcbin: add comphy references to Ethernet ports Antoine Tenart
                   ` (4 subsequent siblings)
  8 siblings, 1 reply; 20+ messages in thread
From: Antoine Tenart @ 2017-09-18  7:58 UTC (permalink / raw)
  To: linux-arm-kernel

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>
---
 .../boot/dts/marvell/armada-cp110-master.dtsi      | 38 ++++++++++++++++++++++
 .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 38 ++++++++++++++++++++++
 2 files changed, 76 insertions(+)

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
index faf7d4a497aa..a26948ff72b4 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
@@ -109,6 +109,44 @@
 				};
 			};
 
+			cpm_comphy: phy at 120000 {
+				compatible = "marvell,comphy-cp110";
+				reg = <0x120000 0x6000>;
+				marvell,system-controller = <&cpm_syscon0>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				cpm_comphy0: phy at 0 {
+					reg = <0>;
+					#phy-cells = <1>;
+				};
+
+				cpm_comphy1: phy at 1 {
+					reg = <1>;
+					#phy-cells = <1>;
+				};
+
+				cpm_comphy2: phy at 2 {
+					reg = <2>;
+					#phy-cells = <1>;
+				};
+
+				cpm_comphy3: phy at 3 {
+					reg = <3>;
+					#phy-cells = <1>;
+				};
+
+				cpm_comphy4: phy at 4 {
+					reg = <4>;
+					#phy-cells = <1>;
+				};
+
+				cpm_comphy5: phy at 5 {
+					reg = <5>;
+					#phy-cells = <1>;
+				};
+			};
+
 			cpm_mdio: mdio at 12a200 {
 				#address-cells = <1>;
 				#size-cells = <0>;
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
index 02d6e2f1a7bf..fe326074edb6 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
@@ -109,6 +109,44 @@
 				};
 			};
 
+			cps_comphy: phy at 120000 {
+				compatible = "marvell,comphy-cp110";
+				reg = <0x120000 0x6000>;
+				marvell,system-controller = <&cps_syscon0>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				cps_comphy0: phy at 0 {
+					reg = <0>;
+					#phy-cells = <1>;
+				};
+
+				cps_comphy1: phy at 1 {
+					reg = <1>;
+					#phy-cells = <1>;
+				};
+
+				cps_comphy2: phy at 2 {
+					reg = <2>;
+					#phy-cells = <1>;
+				};
+
+				cps_comphy3: phy at 3 {
+					reg = <3>;
+					#phy-cells = <1>;
+				};
+
+				cps_comphy4: phy at 4 {
+					reg = <4>;
+					#phy-cells = <1>;
+				};
+
+				cps_comphy5: phy at 5 {
+					reg = <5>;
+					#phy-cells = <1>;
+				};
+			};
+
 			cps_mdio: mdio at 12a200 {
 				#address-cells = <1>;
 				#size-cells = <0>;
-- 
2.13.5

^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [PATCH 5/9] arm64: dts: marvell: mcbin: add comphy references to Ethernet ports
  2017-09-18  7:58 [PATCH 0/9] arm64: marvell: 7k/8k: improve network support Antoine Tenart
                   ` (3 preceding siblings ...)
  2017-09-18  7:58 ` [PATCH 4/9] arm64: dts: marvell: add comphy nodes on cp110 master and slave Antoine Tenart
@ 2017-09-18  7:58 ` Antoine Tenart
  2017-09-18  8:50   ` Baruch Siach
  2017-09-18  7:58 ` [PATCH 6/9] arm64: dts: marvell: 7040-db: add comphy reference to Ethernet port Antoine Tenart
                   ` (3 subsequent siblings)
  8 siblings, 1 reply; 20+ messages in thread
From: Antoine Tenart @ 2017-09-18  7:58 UTC (permalink / raw)
  To: linux-arm-kernel

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>
---
 arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
index acf5c7d16d79..9a3b4a1fd445 100644
--- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
@@ -223,6 +223,7 @@
 &cpm_eth0 {
 	status = "okay";
 	phy = <&phy0>;
+	phys = <&cpm_comphy4 0>;
 	phy-mode = "10gbase-kr";
 };
 
@@ -258,6 +259,7 @@
 &cps_eth0 {
 	status = "okay";
 	phy = <&phy8>;
+	phys = <&cps_comphy4 0>;
 	phy-mode = "10gbase-kr";
 };
 
@@ -266,6 +268,7 @@
 	status = "okay";
 	phy = <&ge_phy>;
 	phy-mode = "sgmii";
+	phys = <&cps_comphy0 1>;
 };
 
 &cps_pinctrl {
-- 
2.13.5

^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [PATCH 6/9] arm64: dts: marvell: 7040-db: add comphy reference to Ethernet port
  2017-09-18  7:58 [PATCH 0/9] arm64: marvell: 7k/8k: improve network support Antoine Tenart
                   ` (4 preceding siblings ...)
  2017-09-18  7:58 ` [PATCH 5/9] arm64: dts: marvell: mcbin: add comphy references to Ethernet ports Antoine Tenart
@ 2017-09-18  7:58 ` Antoine Tenart
  2017-09-18  7:58 ` [PATCH 7/9] arm64: dts: marvell: cp110: add PPv2 port interrupts Antoine Tenart
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 20+ messages in thread
From: Antoine Tenart @ 2017-09-18  7:58 UTC (permalink / raw)
  To: linux-arm-kernel

This patch adds a comphy phandle to the Ethernet port in the 7040-db
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>
---
 arch/arm64/boot/dts/marvell/armada-7040-db.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
index 9c3bdf87e543..274d203dac13 100644
--- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
@@ -219,6 +219,7 @@
 	status = "okay";
 	phy = <&phy0>;
 	phy-mode = "sgmii";
+	phys = <&cpm_comphy0 1>;
 };
 
 &cpm_eth2 {
-- 
2.13.5

^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [PATCH 7/9] arm64: dts: marvell: cp110: add PPv2 port interrupts
  2017-09-18  7:58 [PATCH 0/9] arm64: marvell: 7k/8k: improve network support Antoine Tenart
                   ` (5 preceding siblings ...)
  2017-09-18  7:58 ` [PATCH 6/9] arm64: dts: marvell: 7040-db: add comphy reference to Ethernet port Antoine Tenart
@ 2017-09-18  7:58 ` Antoine Tenart
  2017-09-20 12:47   ` Gregory CLEMENT
  2017-09-18  7:58 ` [PATCH 8/9] arm64: dts: marvell: 7040-db: enable the SFP port Antoine Tenart
  2017-09-18  7:58 ` [PATCH 9/9] arm64: dts: marvell: 8040-db: enable the SFP ports Antoine Tenart
  8 siblings, 1 reply; 20+ messages in thread
From: Antoine Tenart @ 2017-09-18  7:58 UTC (permalink / raw)
  To: linux-arm-kernel

Ports interrupts are used by the PPv2 driver when no PHY is connected to
a port. This patch adds a description of these interrupts.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Tested-by: Marcin Wojtas <mw@semihalf.com>
---
 arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 15 +++++++++------
 arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi  | 15 +++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
index a26948ff72b4..b1119c541f16 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
@@ -74,9 +74,10 @@
 						     <ICU_GRP_NSR 43 IRQ_TYPE_LEVEL_HIGH>,
 						     <ICU_GRP_NSR 47 IRQ_TYPE_LEVEL_HIGH>,
 						     <ICU_GRP_NSR 51 IRQ_TYPE_LEVEL_HIGH>,
-						     <ICU_GRP_NSR 55 IRQ_TYPE_LEVEL_HIGH>;
+						     <ICU_GRP_NSR 55 IRQ_TYPE_LEVEL_HIGH>,
+						     <ICU_GRP_NSR 129 IRQ_TYPE_LEVEL_HIGH>;
 					interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",
-							  "tx-cpu3", "rx-shared";
+							  "tx-cpu3", "rx-shared", "link";
 					port-id = <0>;
 					gop-port-id = <0>;
 					status = "disabled";
@@ -87,9 +88,10 @@
 						     <ICU_GRP_NSR 44 IRQ_TYPE_LEVEL_HIGH>,
 						     <ICU_GRP_NSR 48 IRQ_TYPE_LEVEL_HIGH>,
 						     <ICU_GRP_NSR 52 IRQ_TYPE_LEVEL_HIGH>,
-						     <ICU_GRP_NSR 56 IRQ_TYPE_LEVEL_HIGH>;
+						     <ICU_GRP_NSR 56 IRQ_TYPE_LEVEL_HIGH>,
+						     <ICU_GRP_NSR 128 IRQ_TYPE_LEVEL_HIGH>;
 					interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",
-							  "tx-cpu3", "rx-shared";
+							  "tx-cpu3", "rx-shared", "link";
 					port-id = <1>;
 					gop-port-id = <2>;
 					status = "disabled";
@@ -100,9 +102,10 @@
 						     <ICU_GRP_NSR 45 IRQ_TYPE_LEVEL_HIGH>,
 						     <ICU_GRP_NSR 49 IRQ_TYPE_LEVEL_HIGH>,
 						     <ICU_GRP_NSR 53 IRQ_TYPE_LEVEL_HIGH>,
-						     <ICU_GRP_NSR 57 IRQ_TYPE_LEVEL_HIGH>;
+						     <ICU_GRP_NSR 57 IRQ_TYPE_LEVEL_HIGH>,
+						     <ICU_GRP_NSR 127 IRQ_TYPE_LEVEL_HIGH>;
 					interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",
-							  "tx-cpu3", "rx-shared";
+							  "tx-cpu3", "rx-shared", "link";
 					port-id = <2>;
 					gop-port-id = <3>;
 					status = "disabled";
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
index fe326074edb6..497d233d6c47 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
@@ -74,9 +74,10 @@
 						     <ICU_GRP_NSR 43 IRQ_TYPE_LEVEL_HIGH>,
 						     <ICU_GRP_NSR 47 IRQ_TYPE_LEVEL_HIGH>,
 						     <ICU_GRP_NSR 51 IRQ_TYPE_LEVEL_HIGH>,
-						     <ICU_GRP_NSR 55 IRQ_TYPE_LEVEL_HIGH>;
+						     <ICU_GRP_NSR 55 IRQ_TYPE_LEVEL_HIGH>,
+						     <ICU_GRP_NSR 129 IRQ_TYPE_LEVEL_HIGH>;
 					interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",
-							  "tx-cpu3", "rx-shared";
+							  "tx-cpu3", "rx-shared", "link";
 					port-id = <0>;
 					gop-port-id = <0>;
 					status = "disabled";
@@ -87,9 +88,10 @@
 						     <ICU_GRP_NSR 44 IRQ_TYPE_LEVEL_HIGH>,
 						     <ICU_GRP_NSR 48 IRQ_TYPE_LEVEL_HIGH>,
 						     <ICU_GRP_NSR 52 IRQ_TYPE_LEVEL_HIGH>,
-						     <ICU_GRP_NSR 56 IRQ_TYPE_LEVEL_HIGH>;
+						     <ICU_GRP_NSR 56 IRQ_TYPE_LEVEL_HIGH>,
+						     <ICU_GRP_NSR 128 IRQ_TYPE_LEVEL_HIGH>;
 					interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",
-							  "tx-cpu3", "rx-shared";
+							  "tx-cpu3", "rx-shared", "link";
 					port-id = <1>;
 					gop-port-id = <2>;
 					status = "disabled";
@@ -100,9 +102,10 @@
 						     <ICU_GRP_NSR 45 IRQ_TYPE_LEVEL_HIGH>,
 						     <ICU_GRP_NSR 49 IRQ_TYPE_LEVEL_HIGH>,
 						     <ICU_GRP_NSR 53 IRQ_TYPE_LEVEL_HIGH>,
-						     <ICU_GRP_NSR 57 IRQ_TYPE_LEVEL_HIGH>;
+						     <ICU_GRP_NSR 57 IRQ_TYPE_LEVEL_HIGH>,
+						     <ICU_GRP_NSR 127 IRQ_TYPE_LEVEL_HIGH>;
 					interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",
-							  "tx-cpu3", "rx-shared";
+							  "tx-cpu3", "rx-shared", "link";
 					port-id = <2>;
 					gop-port-id = <3>;
 					status = "disabled";
-- 
2.13.5

^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [PATCH 8/9] arm64: dts: marvell: 7040-db: enable the SFP port
  2017-09-18  7:58 [PATCH 0/9] arm64: marvell: 7k/8k: improve network support Antoine Tenart
                   ` (6 preceding siblings ...)
  2017-09-18  7:58 ` [PATCH 7/9] arm64: dts: marvell: cp110: add PPv2 port interrupts Antoine Tenart
@ 2017-09-18  7:58 ` Antoine Tenart
  2017-09-18  7:58 ` [PATCH 9/9] arm64: dts: marvell: 8040-db: enable the SFP ports Antoine Tenart
  8 siblings, 0 replies; 20+ messages in thread
From: Antoine Tenart @ 2017-09-18  7:58 UTC (permalink / raw)
  To: linux-arm-kernel

This patch enables the SFP port on the Armada 7040 DB as this port
is now supported by the PPv2 driver (since the PHY is now optional).

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Tested-by: Marcin Wojtas <mw@semihalf.com>
---
 arch/arm64/boot/dts/marvell/armada-7040-db.dts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
index 274d203dac13..9ca9aa8ec46e 100644
--- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
@@ -215,6 +215,12 @@
 	status = "okay";
 };
 
+&cpm_eth0 {
+	status = "okay";
+	phy-mode = "10gbase-kr";
+	phys = <&cpm_comphy2 0>;
+};
+
 &cpm_eth1 {
 	status = "okay";
 	phy = <&phy0>;
-- 
2.13.5

^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [PATCH 9/9] arm64: dts: marvell: 8040-db: enable the SFP ports
  2017-09-18  7:58 [PATCH 0/9] arm64: marvell: 7k/8k: improve network support Antoine Tenart
                   ` (7 preceding siblings ...)
  2017-09-18  7:58 ` [PATCH 8/9] arm64: dts: marvell: 7040-db: enable the SFP port Antoine Tenart
@ 2017-09-18  7:58 ` Antoine Tenart
  8 siblings, 0 replies; 20+ messages in thread
From: Antoine Tenart @ 2017-09-18  7:58 UTC (permalink / raw)
  To: linux-arm-kernel

This patch enables the SFP ports on the Armada 8040 DB as these ports
are now supported by the PPv2 driver (since the PHY is now optional).

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Tested-by: Marcin Wojtas <mw@semihalf.com>
---
 arch/arm64/boot/dts/marvell/armada-8040-db.dts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
index 0d7b2ae46610..26a018329a74 100644
--- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
@@ -200,6 +200,11 @@
 	status = "okay";
 };
 
+&cpm_eth0 {
+	status = "okay";
+	phy-mode = "10gbase-kr";
+};
+
 &cpm_eth2 {
 	status = "okay";
 	phy = <&phy1>;
@@ -244,6 +249,11 @@
 	status = "okay";
 };
 
+&cps_eth0 {
+	status = "okay";
+	phy-mode = "10gbase-kr";
+};
+
 &cps_eth1 {
 	status = "okay";
 	phy = <&phy0>;
-- 
2.13.5

^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [PATCH 5/9] arm64: dts: marvell: mcbin: add comphy references to Ethernet ports
  2017-09-18  7:58 ` [PATCH 5/9] arm64: dts: marvell: mcbin: add comphy references to Ethernet ports Antoine Tenart
@ 2017-09-18  8:50   ` Baruch Siach
  2017-09-18  9:44     ` Antoine Tenart
  2017-09-18 13:04     ` Andrew Lunn
  0 siblings, 2 replies; 20+ messages in thread
From: Baruch Siach @ 2017-09-18  8:50 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Antoine,

On Mon, Sep 18, 2017 at 09:58:10AM +0200, Antoine Tenart wrote:
> 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>
> ---
>  arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
> index acf5c7d16d79..9a3b4a1fd445 100644
> --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
> @@ -223,6 +223,7 @@
>  &cpm_eth0 {
>  	status = "okay";
>  	phy = <&phy0>;
> +	phys = <&cpm_comphy4 0>;
>  	phy-mode = "10gbase-kr";

Since the 'phys' generic PHY property is unrelated to the 'phy*' Ethernet PHY 
properties that surround it, its location might be confusing. I think it 
should appear below those two other properties like you did below ...

>  };
>  
> @@ -258,6 +259,7 @@
>  &cps_eth0 {
>  	status = "okay";
>  	phy = <&phy8>;
> +	phys = <&cps_comphy4 0>;
>  	phy-mode = "10gbase-kr";

... not here ...

>  };
>  
> @@ -266,6 +268,7 @@
>  	status = "okay";
>  	phy = <&ge_phy>;
>  	phy-mode = "sgmii";
> +	phys = <&cps_comphy0 1>;

... but here.

See also upstream commits 9a94b3a4bdfdb40 (dt-binding: phy: don't confuse with 
Ethernet phy properties) and c43593d81ab59b (dt-bindings: net: don't confuse 
with generic PHY property).

>  };
>  
>  &cps_pinctrl {

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

^ permalink raw reply	[flat|nested] 20+ messages in thread
* [PATCH 5/9] arm64: dts: marvell: mcbin: add comphy references to Ethernet ports
  2017-09-18  8:50   ` Baruch Siach
@ 2017-09-18  9:44     ` Antoine Tenart
  2017-09-18 13:04     ` Andrew Lunn
  1 sibling, 0 replies; 20+ messages in thread
From: Antoine Tenart @ 2017-09-18  9:44 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Baruch,

On Mon, Sep 18, 2017 at 11:50:12AM +0300, Baruch Siach wrote:
> On Mon, Sep 18, 2017 at 09:58:10AM +0200, Antoine Tenart wrote:
> > 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>
> > ---
> >  arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
> > index acf5c7d16d79..9a3b4a1fd445 100644
> > --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
> > +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
> > @@ -223,6 +223,7 @@
> >  &cpm_eth0 {
> >  	status = "okay";
> >  	phy = <&phy0>;
> > +	phys = <&cpm_comphy4 0>;
> >  	phy-mode = "10gbase-kr";
> 
> Since the 'phys' generic PHY property is unrelated to the 'phy*' Ethernet PHY 
> properties that surround it, its location might be confusing. I think it 
> should appear below those two other properties like you did below ...
> 
> >  };
> >  
> > @@ -258,6 +259,7 @@
> >  &cps_eth0 {
> >  	status = "okay";
> >  	phy = <&phy8>;
> > +	phys = <&cps_comphy4 0>;
> >  	phy-mode = "10gbase-kr";
> 
> ... not here ...
> 
> >  };
> >  
> > @@ -266,6 +268,7 @@
> >  	status = "okay";
> >  	phy = <&ge_phy>;
> >  	phy-mode = "sgmii";
> > +	phys = <&cps_comphy0 1>;
> 
> ... but here.

OK, I'll update.

Thanks,
Antoine

-- 
Antoine T?nart, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170918/ba16b8b7/attachment.sig>

^ permalink raw reply	[flat|nested] 20+ messages in thread
* [PATCH 5/9] arm64: dts: marvell: mcbin: add comphy references to Ethernet ports
  2017-09-18  8:50   ` Baruch Siach
  2017-09-18  9:44     ` Antoine Tenart
@ 2017-09-18 13:04     ` Andrew Lunn
  2017-09-18 13:52       ` Antoine Tenart
  1 sibling, 1 reply; 20+ messages in thread
From: Andrew Lunn @ 2017-09-18 13:04 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Sep 18, 2017 at 11:50:12AM +0300, Baruch Siach wrote:
> Hi Antoine,
> 
> On Mon, Sep 18, 2017 at 09:58:10AM +0200, Antoine Tenart wrote:
> > 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>
> > ---
> >  arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
> > index acf5c7d16d79..9a3b4a1fd445 100644
> > --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
> > +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
> > @@ -223,6 +223,7 @@
> >  &cpm_eth0 {
> >  	status = "okay";
> >  	phy = <&phy0>;
> > +	phys = <&cpm_comphy4 0>;
> >  	phy-mode = "10gbase-kr";
> 
> Since the 'phys' generic PHY property is unrelated to the 'phy*' Ethernet PHY 
> properties that surround it, its location might be confusing. I think it 
> should appear below those two other properties like you did below ...

Hi Baruch, Antoine

Yes, i agree. It is confusing enough as it is, so we should not make
it worse.

I even wonder if it is worth doing some renaming?

  	phy = <&ethernet_phy0>;
  	phy-mode = "10gbase-kr";
 	phys = <&cpm_generic_comphy4 0>;

	Andrew

^ permalink raw reply	[flat|nested] 20+ messages in thread
* [PATCH 5/9] arm64: dts: marvell: mcbin: add comphy references to Ethernet ports
  2017-09-18 13:04     ` Andrew Lunn
@ 2017-09-18 13:52       ` Antoine Tenart
  2017-09-18 16:32         ` Andrew Lunn
  0 siblings, 1 reply; 20+ messages in thread
From: Antoine Tenart @ 2017-09-18 13:52 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Andrew,

On Mon, Sep 18, 2017 at 03:04:37PM +0200, Andrew Lunn wrote:
> On Mon, Sep 18, 2017 at 11:50:12AM +0300, Baruch Siach wrote:
> > On Mon, Sep 18, 2017 at 09:58:10AM +0200, Antoine Tenart wrote:
> > > 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>
> > > ---
> > >  arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 3 +++
> > >  1 file changed, 3 insertions(+)
> > > 
> > > diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
> > > index acf5c7d16d79..9a3b4a1fd445 100644
> > > --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
> > > +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
> > > @@ -223,6 +223,7 @@
> > >  &cpm_eth0 {
> > >  	status = "okay";
> > >  	phy = <&phy0>;
> > > +	phys = <&cpm_comphy4 0>;
> > >  	phy-mode = "10gbase-kr";
> > 
> > Since the 'phys' generic PHY property is unrelated to the 'phy*' Ethernet PHY 
> > properties that surround it, its location might be confusing. I think it 
> > should appear below those two other properties like you did below ...
> 
> Yes, i agree. It is confusing enough as it is, so we should not make
> it worse.
> 
> I even wonder if it is worth doing some renaming?
> 
>   	phy = <&ethernet_phy0>;
>   	phy-mode = "10gbase-kr";
>  	phys = <&cpm_generic_comphy4 0>;

We could also add an extra comment without renaming the comphy node, something
like:

	/* Network PHY */
	phy = <&ethernet_phy0>;
	phy-mode = "10gbase-kr";
	/* Generic PHY, providing serdes lanes */
	phys = <&cpm_comphy4 0>;

Thanks,
Antoine

-- 
Antoine T?nart, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170918/0161fae3/attachment.sig>

^ permalink raw reply	[flat|nested] 20+ messages in thread
* [PATCH 5/9] arm64: dts: marvell: mcbin: add comphy references to Ethernet ports
  2017-09-18 13:52       ` Antoine Tenart
@ 2017-09-18 16:32         ` Andrew Lunn
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Lunn @ 2017-09-18 16:32 UTC (permalink / raw)
  To: linux-arm-kernel

> We could also add an extra comment without renaming the comphy node, something
> like:
> 
> 	/* Network PHY */
> 	phy = <&ethernet_phy0>;
> 	phy-mode = "10gbase-kr";
> 	/* Generic PHY, providing serdes lanes */
> 	phys = <&cpm_comphy4 0>;

Yes, that is good.

Thanks
	Andrew

^ permalink raw reply	[flat|nested] 20+ messages in thread
* [PATCH 1/9] arm64: defconfig: enable the Marvell 10G PHY as a module
  2017-09-18  7:58 ` [PATCH 1/9] arm64: defconfig: enable the Marvell 10G PHY as a module Antoine Tenart
@ 2017-09-20 12:30   ` Gregory CLEMENT
  0 siblings, 0 replies; 20+ messages in thread
From: Gregory CLEMENT @ 2017-09-20 12:30 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Antoine,
 
 On lun., sept. 18 2017, Antoine Tenart <antoine.tenart@free-electrons.com> wrote:

> The Marvell 10G PHY is present on mvebu platforms. Enable it as a module
> so that the network works on these platforms.
>
> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>

Applied on mvebu/arm64

Thanks,

Gregory

> ---
>  arch/arm64/configs/defconfig | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
> index 34480e9af2e7..4c9d4f6692dc 100644
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@ -204,6 +204,7 @@ CONFIG_STMMAC_ETH=m
>  CONFIG_MDIO_BUS_MUX_MMIOREG=y
>  CONFIG_AT803X_PHY=m
>  CONFIG_MARVELL_PHY=m
> +CONFIG_MARVELL_10G_PHY=m
>  CONFIG_MESON_GXL_PHY=m
>  CONFIG_MICREL_PHY=y
>  CONFIG_REALTEK_PHY=m
> -- 
> 2.13.5
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

^ permalink raw reply	[flat|nested] 20+ messages in thread
* [PATCH 2/9] arm64: defconfig: enable Marvell CP110 comphy
  2017-09-18  7:58 ` [PATCH 2/9] arm64: defconfig: enable Marvell CP110 comphy Antoine Tenart
@ 2017-09-20 12:31   ` Gregory CLEMENT
  0 siblings, 0 replies; 20+ messages in thread
From: Gregory CLEMENT @ 2017-09-20 12:31 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Antoine,
 
 On lun., sept. 18 2017, Antoine Tenart <antoine.tenart@free-electrons.com> wrote:

> From: Miquel Raynal <miquel.raynal@free-electrons.com>
>
> The comphy is an hardware block giving access to common PHYs that can be
> used by various other engines (Network, SATA, ...). This is used on
> Marvell 7k/8k platforms for now. Enable the corresponding driver.
>
> Signed-off-by: Miquel Raynal <miquel.raynal@free-electrons.com>
> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>

Applied on mvebu/arm64

Thanks,

Gregory

> ---
>  arch/arm64/configs/defconfig | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
> index 4c9d4f6692dc..8495b88a0966 100644
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@ -535,6 +535,7 @@ CONFIG_PWM_TEGRA=m
>  CONFIG_PHY_RCAR_GEN3_USB2=y
>  CONFIG_PHY_HI6220_USB=y
>  CONFIG_PHY_SUN4I_USB=y
> +CONFIG_PHY_MVEBU_CP110_COMPHY=y
>  CONFIG_PHY_ROCKCHIP_INNO_USB2=y
>  CONFIG_PHY_ROCKCHIP_EMMC=y
>  CONFIG_PHY_ROCKCHIP_PCIE=m
> -- 
> 2.13.5
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

^ permalink raw reply	[flat|nested] 20+ messages in thread
* [PATCH 3/9] arm64: dts: marvell: extend the cp110 syscon register area length
  2017-09-18  7:58 ` [PATCH 3/9] arm64: dts: marvell: extend the cp110 syscon register area length Antoine Tenart
@ 2017-09-20 12:46   ` Gregory CLEMENT
  0 siblings, 0 replies; 20+ messages in thread
From: Gregory CLEMENT @ 2017-09-20 12:46 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Antoine,
 
 On lun., sept. 18 2017, Antoine Tenart <antoine.tenart@free-electrons.com> wrote:

> This patch extends on both cp110 the system register area length to
> include some of the comphy registers as well.
>
> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>

Applied on mvebu/dt64

Thanks,

Gregory
> ---
>  arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 2 +-
>  arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi  | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
> index 8263a8a504a8..faf7d4a497aa 100644
> --- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
> @@ -143,7 +143,7 @@
>  
>  			cpm_syscon0: system-controller at 440000 {
>  				compatible = "syscon", "simple-mfd";
> -				reg = <0x440000 0x1000>;
> +				reg = <0x440000 0x2000>;
>  
>  				cpm_clk: clock {
>  					compatible = "marvell,cp110-clock";
> diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
> index b71ee6c83668..02d6e2f1a7bf 100644
> --- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
> @@ -143,7 +143,7 @@
>  
>  			cps_syscon0: system-controller at 440000 {
>  				compatible = "syscon", "simple-mfd";
> -				reg = <0x440000 0x1000>;
> +				reg = <0x440000 0x2000>;
>  
>  				cps_clk: clock {
>  					compatible = "marvell,cp110-clock";
> -- 
> 2.13.5
>

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

^ permalink raw reply	[flat|nested] 20+ messages in thread
* [PATCH 4/9] arm64: dts: marvell: add comphy nodes on cp110 master and slave
  2017-09-18  7:58 ` [PATCH 4/9] arm64: dts: marvell: add comphy nodes on cp110 master and slave Antoine Tenart
@ 2017-09-20 12:47   ` Gregory CLEMENT
  0 siblings, 0 replies; 20+ messages in thread
From: Gregory CLEMENT @ 2017-09-20 12:47 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Antoine,
 
 On lun., sept. 18 2017, Antoine Tenart <antoine.tenart@free-electrons.com> wrote:

> 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>

Applied on mvebu/dt64

Thanks,

Gregory
> ---
>  .../boot/dts/marvell/armada-cp110-master.dtsi      | 38 ++++++++++++++++++++++
>  .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 38 ++++++++++++++++++++++
>  2 files changed, 76 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
> index faf7d4a497aa..a26948ff72b4 100644
> --- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
> @@ -109,6 +109,44 @@
>  				};
>  			};
>  
> +			cpm_comphy: phy at 120000 {
> +				compatible = "marvell,comphy-cp110";
> +				reg = <0x120000 0x6000>;
> +				marvell,system-controller = <&cpm_syscon0>;
> +				#address-cells = <1>;
> +				#size-cells = <0>;
> +
> +				cpm_comphy0: phy at 0 {
> +					reg = <0>;
> +					#phy-cells = <1>;
> +				};
> +
> +				cpm_comphy1: phy at 1 {
> +					reg = <1>;
> +					#phy-cells = <1>;
> +				};
> +
> +				cpm_comphy2: phy at 2 {
> +					reg = <2>;
> +					#phy-cells = <1>;
> +				};
> +
> +				cpm_comphy3: phy at 3 {
> +					reg = <3>;
> +					#phy-cells = <1>;
> +				};
> +
> +				cpm_comphy4: phy at 4 {
> +					reg = <4>;
> +					#phy-cells = <1>;
> +				};
> +
> +				cpm_comphy5: phy at 5 {
> +					reg = <5>;
> +					#phy-cells = <1>;
> +				};
> +			};
> +
>  			cpm_mdio: mdio at 12a200 {
>  				#address-cells = <1>;
>  				#size-cells = <0>;
> diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
> index 02d6e2f1a7bf..fe326074edb6 100644
> --- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
> @@ -109,6 +109,44 @@
>  				};
>  			};
>  
> +			cps_comphy: phy at 120000 {
> +				compatible = "marvell,comphy-cp110";
> +				reg = <0x120000 0x6000>;
> +				marvell,system-controller = <&cps_syscon0>;
> +				#address-cells = <1>;
> +				#size-cells = <0>;
> +
> +				cps_comphy0: phy at 0 {
> +					reg = <0>;
> +					#phy-cells = <1>;
> +				};
> +
> +				cps_comphy1: phy at 1 {
> +					reg = <1>;
> +					#phy-cells = <1>;
> +				};
> +
> +				cps_comphy2: phy at 2 {
> +					reg = <2>;
> +					#phy-cells = <1>;
> +				};
> +
> +				cps_comphy3: phy at 3 {
> +					reg = <3>;
> +					#phy-cells = <1>;
> +				};
> +
> +				cps_comphy4: phy at 4 {
> +					reg = <4>;
> +					#phy-cells = <1>;
> +				};
> +
> +				cps_comphy5: phy at 5 {
> +					reg = <5>;
> +					#phy-cells = <1>;
> +				};
> +			};
> +
>  			cps_mdio: mdio at 12a200 {
>  				#address-cells = <1>;
>  				#size-cells = <0>;
> -- 
> 2.13.5
>

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

^ permalink raw reply	[flat|nested] 20+ messages in thread
* [PATCH 7/9] arm64: dts: marvell: cp110: add PPv2 port interrupts
  2017-09-18  7:58 ` [PATCH 7/9] arm64: dts: marvell: cp110: add PPv2 port interrupts Antoine Tenart
@ 2017-09-20 12:47   ` Gregory CLEMENT
  0 siblings, 0 replies; 20+ messages in thread
From: Gregory CLEMENT @ 2017-09-20 12:47 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Antoine,
 
 On lun., sept. 18 2017, Antoine Tenart <antoine.tenart@free-electrons.com> wrote:

> Ports interrupts are used by the PPv2 driver when no PHY is connected to
> a port. This patch adds a description of these interrupts.
>
> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
> Tested-by: Marcin Wojtas <mw@semihalf.com>

Applied on mvebu/dt64

Thanks,

Gregory
> ---
>  arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 15 +++++++++------
>  arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi  | 15 +++++++++------
>  2 files changed, 18 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
> index a26948ff72b4..b1119c541f16 100644
> --- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
> @@ -74,9 +74,10 @@
>  						     <ICU_GRP_NSR 43 IRQ_TYPE_LEVEL_HIGH>,
>  						     <ICU_GRP_NSR 47 IRQ_TYPE_LEVEL_HIGH>,
>  						     <ICU_GRP_NSR 51 IRQ_TYPE_LEVEL_HIGH>,
> -						     <ICU_GRP_NSR 55 IRQ_TYPE_LEVEL_HIGH>;
> +						     <ICU_GRP_NSR 55 IRQ_TYPE_LEVEL_HIGH>,
> +						     <ICU_GRP_NSR 129 IRQ_TYPE_LEVEL_HIGH>;
>  					interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",
> -							  "tx-cpu3", "rx-shared";
> +							  "tx-cpu3", "rx-shared", "link";
>  					port-id = <0>;
>  					gop-port-id = <0>;
>  					status = "disabled";
> @@ -87,9 +88,10 @@
>  						     <ICU_GRP_NSR 44 IRQ_TYPE_LEVEL_HIGH>,
>  						     <ICU_GRP_NSR 48 IRQ_TYPE_LEVEL_HIGH>,
>  						     <ICU_GRP_NSR 52 IRQ_TYPE_LEVEL_HIGH>,
> -						     <ICU_GRP_NSR 56 IRQ_TYPE_LEVEL_HIGH>;
> +						     <ICU_GRP_NSR 56 IRQ_TYPE_LEVEL_HIGH>,
> +						     <ICU_GRP_NSR 128 IRQ_TYPE_LEVEL_HIGH>;
>  					interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",
> -							  "tx-cpu3", "rx-shared";
> +							  "tx-cpu3", "rx-shared", "link";
>  					port-id = <1>;
>  					gop-port-id = <2>;
>  					status = "disabled";
> @@ -100,9 +102,10 @@
>  						     <ICU_GRP_NSR 45 IRQ_TYPE_LEVEL_HIGH>,
>  						     <ICU_GRP_NSR 49 IRQ_TYPE_LEVEL_HIGH>,
>  						     <ICU_GRP_NSR 53 IRQ_TYPE_LEVEL_HIGH>,
> -						     <ICU_GRP_NSR 57 IRQ_TYPE_LEVEL_HIGH>;
> +						     <ICU_GRP_NSR 57 IRQ_TYPE_LEVEL_HIGH>,
> +						     <ICU_GRP_NSR 127 IRQ_TYPE_LEVEL_HIGH>;
>  					interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",
> -							  "tx-cpu3", "rx-shared";
> +							  "tx-cpu3", "rx-shared", "link";
>  					port-id = <2>;
>  					gop-port-id = <3>;
>  					status = "disabled";
> diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
> index fe326074edb6..497d233d6c47 100644
> --- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
> @@ -74,9 +74,10 @@
>  						     <ICU_GRP_NSR 43 IRQ_TYPE_LEVEL_HIGH>,
>  						     <ICU_GRP_NSR 47 IRQ_TYPE_LEVEL_HIGH>,
>  						     <ICU_GRP_NSR 51 IRQ_TYPE_LEVEL_HIGH>,
> -						     <ICU_GRP_NSR 55 IRQ_TYPE_LEVEL_HIGH>;
> +						     <ICU_GRP_NSR 55 IRQ_TYPE_LEVEL_HIGH>,
> +						     <ICU_GRP_NSR 129 IRQ_TYPE_LEVEL_HIGH>;
>  					interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",
> -							  "tx-cpu3", "rx-shared";
> +							  "tx-cpu3", "rx-shared", "link";
>  					port-id = <0>;
>  					gop-port-id = <0>;
>  					status = "disabled";
> @@ -87,9 +88,10 @@
>  						     <ICU_GRP_NSR 44 IRQ_TYPE_LEVEL_HIGH>,
>  						     <ICU_GRP_NSR 48 IRQ_TYPE_LEVEL_HIGH>,
>  						     <ICU_GRP_NSR 52 IRQ_TYPE_LEVEL_HIGH>,
> -						     <ICU_GRP_NSR 56 IRQ_TYPE_LEVEL_HIGH>;
> +						     <ICU_GRP_NSR 56 IRQ_TYPE_LEVEL_HIGH>,
> +						     <ICU_GRP_NSR 128 IRQ_TYPE_LEVEL_HIGH>;
>  					interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",
> -							  "tx-cpu3", "rx-shared";
> +							  "tx-cpu3", "rx-shared", "link";
>  					port-id = <1>;
>  					gop-port-id = <2>;
>  					status = "disabled";
> @@ -100,9 +102,10 @@
>  						     <ICU_GRP_NSR 45 IRQ_TYPE_LEVEL_HIGH>,
>  						     <ICU_GRP_NSR 49 IRQ_TYPE_LEVEL_HIGH>,
>  						     <ICU_GRP_NSR 53 IRQ_TYPE_LEVEL_HIGH>,
> -						     <ICU_GRP_NSR 57 IRQ_TYPE_LEVEL_HIGH>;
> +						     <ICU_GRP_NSR 57 IRQ_TYPE_LEVEL_HIGH>,
> +						     <ICU_GRP_NSR 127 IRQ_TYPE_LEVEL_HIGH>;
>  					interrupt-names = "tx-cpu0", "tx-cpu1", "tx-cpu2",
> -							  "tx-cpu3", "rx-shared";
> +							  "tx-cpu3", "rx-shared", "link";
>  					port-id = <2>;
>  					gop-port-id = <3>;
>  					status = "disabled";
> -- 
> 2.13.5
>

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

^ permalink raw reply	[flat|nested] 20+ messages in thread
end of thread, other threads:[~2017-09-20 12:47 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-18  7:58 [PATCH 0/9] arm64: marvell: 7k/8k: improve network support Antoine Tenart
2017-09-18  7:58 ` [PATCH 1/9] arm64: defconfig: enable the Marvell 10G PHY as a module Antoine Tenart
2017-09-20 12:30   ` Gregory CLEMENT
2017-09-18  7:58 ` [PATCH 2/9] arm64: defconfig: enable Marvell CP110 comphy Antoine Tenart
2017-09-20 12:31   ` Gregory CLEMENT
2017-09-18  7:58 ` [PATCH 3/9] arm64: dts: marvell: extend the cp110 syscon register area length Antoine Tenart
2017-09-20 12:46   ` Gregory CLEMENT
2017-09-18  7:58 ` [PATCH 4/9] arm64: dts: marvell: add comphy nodes on cp110 master and slave Antoine Tenart
2017-09-20 12:47   ` Gregory CLEMENT
2017-09-18  7:58 ` [PATCH 5/9] arm64: dts: marvell: mcbin: add comphy references to Ethernet ports Antoine Tenart
2017-09-18  8:50   ` Baruch Siach
2017-09-18  9:44     ` Antoine Tenart
2017-09-18 13:04     ` Andrew Lunn
2017-09-18 13:52       ` Antoine Tenart
2017-09-18 16:32         ` Andrew Lunn
2017-09-18  7:58 ` [PATCH 6/9] arm64: dts: marvell: 7040-db: add comphy reference to Ethernet port Antoine Tenart
2017-09-18  7:58 ` [PATCH 7/9] arm64: dts: marvell: cp110: add PPv2 port interrupts Antoine Tenart
2017-09-20 12:47   ` Gregory CLEMENT
2017-09-18  7:58 ` [PATCH 8/9] arm64: dts: marvell: 7040-db: enable the SFP port Antoine Tenart
2017-09-18  7:58 ` [PATCH 9/9] arm64: dts: marvell: 8040-db: enable the SFP ports Antoine Tenart

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.