[PATCH v2 0/3] Add missing DSA properties for marvell switches

[PATCH v2 0/3] Add missing DSA properties for marvell switches

[Andrew Lunn]

The DSA core has become more picky about DT properties. This patchset
add missing properties and removes some unused ones, for iMX boards.

Once all the missing properties are added, it should be possible to
simply phylink and the mv88e6xxx driver.

v2:
Use rev-mii or rev-rmii for the side of the MAC-MAC link which plays
PHY.

Andrew Lunn (3):
  ARM: dts: imx51: ZII: Add missing phy-mode
  ARM: dts: imx6qdl: Add missing phy-mode and fixed links
  ARM64: dts: freescale: ZII: Add missing phy-mode

 arch/arm/boot/dts/imx51-zii-rdu1.dts                | 2 +-
 arch/arm/boot/dts/imx51-zii-scu2-mezz.dts           | 2 +-
 arch/arm/boot/dts/imx51-zii-scu3-esb.dts            | 1 -
 arch/arm/boot/dts/imx6qdl-gw5904.dtsi               | 7 ++++++-
 arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi             | 2 +-
 arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)

-- 
2.40.0

[PATCH v2 1/3] ARM: dts: imx51: ZII: Add missing phy-mode

[Andrew Lunn]

The DSA framework has got more picky about always having a phy-mode
for the CPU port. The imx51 Ethernet supports MII, and RMII. Set the
switch phy-mode based on how the SoC Ethernet port has been
configured.

Additionally, the cpu label has never actually been used in the
binding, so remove it.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
v2: Use rev-mii for the side 'playing PHY'.
---
 arch/arm/boot/dts/imx51-zii-rdu1.dts      | 2 +-
 arch/arm/boot/dts/imx51-zii-scu2-mezz.dts | 2 +-
 arch/arm/boot/dts/imx51-zii-scu3-esb.dts  | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts
index e537e06e11d7..ab539a68b9ac 100644
--- a/arch/arm/boot/dts/imx51-zii-rdu1.dts
+++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts
@@ -181,7 +181,7 @@ ports {
 
 				port@0 {
 					reg = <0>;
-					label = "cpu";
+					phy-mode = "rev-mii";
 					ethernet = <&fec>;
 
 					fixed-link {
diff --git a/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts b/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts
index 21dd3f7abd48..625f9ac671ae 100644
--- a/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts
+++ b/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts
@@ -82,7 +82,7 @@ port@3 {
 
 				port@4 {
 					reg = <4>;
-					label = "cpu";
+					phy-mode = "rev-mii";
 					ethernet = <&fec>;
 
 					fixed-link {
diff --git a/arch/arm/boot/dts/imx51-zii-scu3-esb.dts b/arch/arm/boot/dts/imx51-zii-scu3-esb.dts
index 9f857eb44bf7..19a3b142c964 100644
--- a/arch/arm/boot/dts/imx51-zii-scu3-esb.dts
+++ b/arch/arm/boot/dts/imx51-zii-scu3-esb.dts
@@ -267,7 +267,6 @@ fixed-link {
 
 				port@6 {
 					reg = <6>;
-					label = "cpu";
 					phy-mode = "mii";
 					ethernet = <&fec>;
 
-- 
2.40.0

[PATCH v2 2/3] ARM: dts: imx6qdl: Add missing phy-mode and fixed links

[Andrew Lunn]

The DSA framework has got more picky about always having a phy-mode
for the CPU port. Add a phy-mode based on what the SoC ethernet is
using. For RGMII mode, have the switch add the delays.

Additionally, the cpu label has never actually been used in the
binding, so remove it.

Lastly add a fixed-link node indicating the expected speed/duplex of
the link to the SoC.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
v2: Use rev-rmii for the side 'playing PHY'
---
 arch/arm/boot/dts/imx6qdl-gw5904.dtsi   | 7 ++++++-
 arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/imx6qdl-gw5904.dtsi b/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
index 9fc79af2bc9a..9594bc5745ed 100644
--- a/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
@@ -238,8 +238,13 @@ port@3 {
 
 				port@5 {
 					reg = <5>;
-					label = "cpu";
 					ethernet = <&fec>;
+					phy-mode = "rgmii-id";
+
+					fixed-link {
+						speed = <1000>;
+						full-duplex;
+					};
 				};
 			};
 		};
diff --git a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi
index 5bb47c79a4da..abd72d72ae99 100644
--- a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi
@@ -757,7 +757,7 @@ port@1 {
 
 				port@2 {
 					reg = <2>;
-					label = "cpu";
+					phy-mode = "rev-rmii";
 					ethernet = <&fec>;
 
 					fixed-link {
-- 
2.40.0

[PATCH v2 3/3] ARM64: dts: freescale: ZII: Add missing phy-mode

[Andrew Lunn]

The DSA framework has got more picky about always having a phy-mode
for the CPU port. The imx8mq Ethernet is being configured to RMII. Set
the switch phy-mode based on this.

Additionally, the cpu label has never actually been used in the
binding, so remove it.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
v2: Use rev-rmii for the side 'playing PHY'
---
 arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi b/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi
index 3a52679ecd68..cb777b47baf9 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi
@@ -177,7 +177,7 @@ port@1 {
 
 				port@2 {
 					reg = <2>;
-					label = "cpu";
+					phy-mode = "rev-rmii";
 					ethernet = <&fec1>;
 
 					fixed-link {
-- 
2.40.0

Re: [PATCH v2 1/3] ARM: dts: imx51: ZII: Add missing phy-mode

[Vladimir Oltean]

On Sat, Apr 08, 2023 at 05:27:59PM +0200, Andrew Lunn wrote:
> The DSA framework has got more picky about always having a phy-mode
> for the CPU port. The imx51 Ethernet supports MII, and RMII. Set the
> switch phy-mode based on how the SoC Ethernet port has been
> configured.
> 
> Additionally, the cpu label has never actually been used in the
> binding, so remove it.
> 
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
> v2: Use rev-mii for the side 'playing PHY'.
> ---

Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>

Re: [PATCH v2 2/3] ARM: dts: imx6qdl: Add missing phy-mode and fixed links

[Vladimir Oltean]

On Sat, Apr 08, 2023 at 05:28:00PM +0200, Andrew Lunn wrote:
> The DSA framework has got more picky about always having a phy-mode
> for the CPU port. Add a phy-mode based on what the SoC ethernet is
> using. For RGMII mode, have the switch add the delays.
> 
> Additionally, the cpu label has never actually been used in the
> binding, so remove it.
> 
> Lastly add a fixed-link node indicating the expected speed/duplex of
> the link to the SoC.
> 
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
> v2: Use rev-rmii for the side 'playing PHY'
> ---

Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>

Re: [PATCH v2 3/3] ARM64: dts: freescale: ZII: Add missing phy-mode

[Vladimir Oltean]

On Sat, Apr 08, 2023 at 05:28:01PM +0200, Andrew Lunn wrote:
> The DSA framework has got more picky about always having a phy-mode
> for the CPU port. The imx8mq Ethernet is being configured to RMII. Set
> the switch phy-mode based on this.
> 
> Additionally, the cpu label has never actually been used in the
> binding, so remove it.
> 
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
> v2: Use rev-rmii for the side 'playing PHY'
> ---

Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>

Re: [PATCH v2 0/3] Add missing DSA properties for marvell switches

[Shawn Guo]

On Sat, Apr 08, 2023 at 05:27:58PM +0200, Andrew Lunn wrote:
> The DSA core has become more picky about DT properties. This patchset
> add missing properties and removes some unused ones, for iMX boards.
> 
> Once all the missing properties are added, it should be possible to
> simply phylink and the mv88e6xxx driver.
> 
> v2:
> Use rev-mii or rev-rmii for the side of the MAC-MAC link which plays
> PHY.
> 
> Andrew Lunn (3):
>   ARM: dts: imx51: ZII: Add missing phy-mode
>   ARM: dts: imx6qdl: Add missing phy-mode and fixed links
>   ARM64: dts: freescale: ZII: Add missing phy-mode

Applied all, thanks!