Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1560901 > unrolled thread

[PATCH v3 0/8] ARM: dts: Switch to new DSA binding

Started byFlorian Fainelli <f.fainelli@gmail.com>
First post2017-01-17 19:40 +0100
Last post2017-01-19 23:50 +0100
Articles 8 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH v3 0/8] ARM: dts: Switch to new DSA binding Florian Fainelli <f.fainelli@gmail.com> - 2017-01-17 19:40 +0100
    [PATCH v3 3/8] ARM: dts: armada-388-clearfog: Utilize new DSA binding Florian Fainelli <f.fainelli@gmail.com> - 2017-01-17 19:40 +0100
    [PATCH v3 1/8] ARM: dts: armada-370-rd: Utilize new DSA binding Florian Fainelli <f.fainelli@gmail.com> - 2017-01-17 19:40 +0100
    [PATCH v3 2/8] ARM: dts: armada-385-linksys: Utilize new DSA binding Florian Fainelli <f.fainelli@gmail.com> - 2017-01-17 19:40 +0100
    [PATCH v3 7/8] ARM: dts: kirkwood-mv88f6281gtw-ge: Utilize new DSA binding Florian Fainelli <f.fainelli@gmail.com> - 2017-01-17 19:40 +0100
    Re: [PATCH v3 0/8] ARM: dts: Switch to new DSA binding Florian Fainelli <f.fainelli@gmail.com> - 2017-01-19 23:40 +0100
      Re: [PATCH v3 0/8] ARM: dts: Switch to new DSA binding Florian Fainelli <f.fainelli@gmail.com> - 2017-01-19 23:50 +0100
      Re: [PATCH v3 0/8] ARM: dts: Switch to new DSA binding Gregory CLEMENT <gregory.clement@free-electrons.com> - 2017-01-19 23:50 +0100

#1560901 — [PATCH v3 0/8] ARM: dts: Switch to new DSA binding

FromFlorian Fainelli <f.fainelli@gmail.com>
Date2017-01-17 19:40 +0100
Subject[PATCH v3 0/8] ARM: dts: Switch to new DSA binding
Message-ID<t0GG6-22h-19@gated-at.bofh.it>
Hi all,

This patch series converts the in-tree users to utilize the new (relatively)
DSA binding that was introduced with commit 8c5ad1d6179d ("net: dsa: Document
new binding"). The legacy binding node is kept included, but is marked
disabled.

Changes in v3:

- collected tags from Andrew and Russell
- added missing change to arch/arm/boot/dts/kirkwood-rd88f6281-a.dts

Changes in v2:

- patch 1: Use an hexadecimal reg property
- patch 2: fixed the subject
- patch 3: s/okay/disabled/ for the legacy DSA node
- patches 7/8: fixed a stray whitespace

In about 2-3 releases we may consider removing the old DSA binding entirely
from the kernel.

Thank you!

Florian Fainelli (8):
  ARM: dts: armada-370-rd: Utilize new DSA binding
  ARM: dts: armada-385-linksys: Utilize new DSA binding
  ARM: dts: armada-388-clearfog: Utilize new DSA binding
  ARM: dts: armada-xp-linksys-mamba: Utilize new DSA binding
  ARM: dts: kirkwood-dir665: Utilize new DSA binding
  ARM: dts: kirkwood-linksys-viper: Utilize new DSA binding
  ARM: dts: kirkwood-mv88f6281gtw-ge: Utilize new DSA binding
  ARM: dts: kirkwood-rd88f6281: Utilize new DSA binding

 arch/arm/boot/dts/armada-370-rd.dts            | 44 +++++++++++++++++
 arch/arm/boot/dts/armada-385-linksys.dtsi      | 52 ++++++++++++++++++++-
 arch/arm/boot/dts/armada-388-clearfog.dts      | 65 ++++++++++++++++++++++++++
 arch/arm/boot/dts/armada-xp-linksys-mamba.dts  | 53 +++++++++++++++++++++
 arch/arm/boot/dts/kirkwood-dir665.dts          | 49 +++++++++++++++++++
 arch/arm/boot/dts/kirkwood-linksys-viper.dts   | 49 +++++++++++++++++++
 arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 49 +++++++++++++++++++
 arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts    | 11 +++++
 arch/arm/boot/dts/kirkwood-rd88f6281.dtsi      | 44 +++++++++++++++++
 9 files changed, 415 insertions(+), 1 deletion(-)

-- 
2.9.3

[toc] | [next] | [standalone]

#1560904 — [PATCH v3 3/8] ARM: dts: armada-388-clearfog: Utilize new DSA binding

FromFlorian Fainelli <f.fainelli@gmail.com>
Date2017-01-17 19:40 +0100
Subject[PATCH v3 3/8] ARM: dts: armada-388-clearfog: Utilize new DSA binding
Message-ID<t0GPM-25I-29@gated-at.bofh.it>
In reply to#1560901
Utilize the new DSA binding, introduced with commit 8c5ad1d6179d ("net:
dsa: Document new binding"). The legacy binding node is kept included, but is
marked disabled.

Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 arch/arm/boot/dts/armada-388-clearfog.dts | 65 +++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/arch/arm/boot/dts/armada-388-clearfog.dts b/arch/arm/boot/dts/armada-388-clearfog.dts
index 71ce201c903e..40ec6d768669 100644
--- a/arch/arm/boot/dts/armada-388-clearfog.dts
+++ b/arch/arm/boot/dts/armada-388-clearfog.dts
@@ -351,6 +351,8 @@
 	};
 
 	dsa@0 {
+		status = "disabled";
+
 		compatible = "marvell,dsa";
 		dsa,ethernet = <&eth1>;
 		dsa,mii-bus = <&mdio>;
@@ -444,3 +446,66 @@
 		status = "disabled";
 	};
 };
+
+&mdio {
+	status = "okay";
+
+	switch@4 {
+		compatible = "marvell,mv88e6085";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <4>;
+		pinctrl-0 = <&clearfog_dsa0_clk_pins &clearfog_dsa0_pins>;
+		pinctrl-names = "default";
+
+		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+				label = "lan5";
+			};
+
+			port@1 {
+				reg = <1>;
+				label = "lan4";
+			};
+
+			port@2 {
+				reg = <2>;
+				label = "lan3";
+			};
+
+			port@3 {
+				reg = <3>;
+				label = "lan2";
+			};
+
+			port@4 {
+				reg = <4>;
+				label = "lan1";
+			};
+
+			port@5 {
+				reg = <5>;
+				label = "cpu";
+				ethernet = <&eth1>;
+				fixed-link {
+					speed = <1000>;
+					full-duplex;
+				};
+			};
+
+			port@6 {
+				/* 88E1512 external phy */
+				reg = <6>;
+				label = "lan6";
+				fixed-link {
+					speed = <1000>;
+					full-duplex;
+				};
+			};
+		};
+	};
+};
-- 
2.9.3

[toc] | [prev] | [next] | [standalone]

#1560907 — [PATCH v3 1/8] ARM: dts: armada-370-rd: Utilize new DSA binding

FromFlorian Fainelli <f.fainelli@gmail.com>
Date2017-01-17 19:40 +0100
Subject[PATCH v3 1/8] ARM: dts: armada-370-rd: Utilize new DSA binding
Message-ID<t0GPN-25I-35@gated-at.bofh.it>
In reply to#1560901
Utilize the new DSA binding, introduced with commit 8c5ad1d6179d ("net: dsa:
Document new binding"). The legacy binding node is kept included, but is marked
disabled.

Tested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 arch/arm/boot/dts/armada-370-rd.dts | 44 +++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
index c3fd6e49212f..ade956cbd41a 100644
--- a/arch/arm/boot/dts/armada-370-rd.dts
+++ b/arch/arm/boot/dts/armada-370-rd.dts
@@ -173,6 +173,8 @@
 	};
 
 	dsa {
+		status = "disabled";
+
 		compatible = "marvell,dsa";
 		#address-cells = <2>;
 		#size-cells = <0>;
@@ -235,6 +237,48 @@
 	phy0: ethernet-phy@0 {
 		reg = <0>;
 	};
+
+	switch: switch@10 {
+		compatible = "marvell,mv88e6085";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0x10>;
+
+		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+				label = "lan0";
+			};
+
+			port@1 {
+			       reg = <1>;
+			       label = "lan1";
+			};
+
+			port@2 {
+			       reg = <2>;
+			       label = "lan2";
+			};
+
+			port@3 {
+			       reg = <3>;
+			       label = "lan3";
+			};
+
+			port@5 {
+				reg = <5>;
+				label = "cpu";
+				ethernet = <&eth1>;
+				fixed-link {
+					speed = <1000>;
+					full-duplex;
+				};
+			};
+		};
+	};
 };
 
 
-- 
2.9.3

[toc] | [prev] | [next] | [standalone]

#1560909 — [PATCH v3 2/8] ARM: dts: armada-385-linksys: Utilize new DSA binding

FromFlorian Fainelli <f.fainelli@gmail.com>
Date2017-01-17 19:40 +0100
Subject[PATCH v3 2/8] ARM: dts: armada-385-linksys: Utilize new DSA binding
Message-ID<t0GPN-25I-51@gated-at.bofh.it>
In reply to#1560901
Utilize the new DSA binding, introduced with commit 8c5ad1d6179d ("net: dsa:
Document new binding"). The legacy binding node is kept included, but is marked
disabled.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 arch/arm/boot/dts/armada-385-linksys.dtsi | 52 ++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index 8f0e508f64ae..20d5e8b00f2d 100644
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -103,8 +103,56 @@
 				};
 			};
 
-			mdio {
+			mdio@72004 {
 				status = "okay";
+
+				switch@0 {
+					compatible = "marvell,mv88e6095";
+					#address-cells = <1>;
+					#size-cells = <0>;
+					reg = <0>;
+
+					ports {
+						#address-cells = <1>;
+						#size-cells = <0>;
+
+						port@0 {
+							reg = <0>;
+							label = "lan4";
+						};
+
+						port@1 {
+							reg = <1>;
+							label = "lan3";
+						};
+
+						port@2 {
+							reg = <2>;
+							label = "lan2";
+						};
+
+						port@3 {
+							reg = <3>;
+							label = "lan1";
+						};
+
+						port@4 {
+							reg = <4>;
+							label = "wan";
+						};
+
+						port@5 {
+							reg = <5>;
+							label = "cpu";
+							ethernet = <&eth2>;
+
+							fixed-link {
+								speed = <1000>;
+								full-duplex;
+							};
+						};
+					};
+				};
 			};
 
 			sata@a8000 {
@@ -261,6 +309,8 @@
 	};
 
 	dsa@0 {
+		status = "disabled";
+
 		compatible = "marvell,dsa";
 		#address-cells = <2>;
 		#size-cells = <0>;
-- 
2.9.3

[toc] | [prev] | [next] | [standalone]

#1560910 — [PATCH v3 7/8] ARM: dts: kirkwood-mv88f6281gtw-ge: Utilize new DSA binding

FromFlorian Fainelli <f.fainelli@gmail.com>
Date2017-01-17 19:40 +0100
Subject[PATCH v3 7/8] ARM: dts: kirkwood-mv88f6281gtw-ge: Utilize new DSA binding
Message-ID<t0GPN-25I-45@gated-at.bofh.it>
In reply to#1560901
Utilize the new DSA binding, introduced with commit 8c5ad1d6179d ("net: dsa:
Document new binding"). The legacy binding node is kept included, but is marked
disabled.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 49 ++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
index 172a38c0b8a9..327023a477b8 100644
--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@ -112,6 +112,8 @@
 	};
 
 	dsa {
+		status = "disabled";
+
 		compatible = "marvell,dsa";
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -159,6 +161,53 @@
 
 &mdio {
 	status = "okay";
+
+	switch@0 {
+		compatible = "marvell,mv88e6085";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0>;
+
+		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+				label = "lan1";
+			};
+
+			port@1 {
+				reg = <1>;
+				label = "lan2";
+			};
+
+			port@2 {
+				reg = <2>;
+				label = "lan3";
+			};
+
+			port@3 {
+				reg = <3>;
+				label = "lan4";
+			};
+
+			port@4 {
+				reg = <4>;
+				label = "wan";
+			};
+
+			port@5 {
+				reg = <5>;
+				label = "cpu";
+				ethernet = <&eth0port>;
+				fixed-link {
+					speed = <1000>;
+					full-duplex;
+				};
+			};
+		};
+	};
 };
 
 &eth0 {
-- 
2.9.3

[toc] | [prev] | [next] | [standalone]

#1563160

FromFlorian Fainelli <f.fainelli@gmail.com>
Date2017-01-19 23:40 +0100
Message-ID<t1tx7-7sA-5@gated-at.bofh.it>
In reply to#1560901
On 01/17/2017 10:22 AM, Florian Fainelli wrote:
> Hi all,
> 
> This patch series converts the in-tree users to utilize the new (relatively)
> DSA binding that was introduced with commit 8c5ad1d6179d ("net: dsa: Document
> new binding"). The legacy binding node is kept included, but is marked
> disabled.
> 
> Changes in v3:
> 
> - collected tags from Andrew and Russell
> - added missing change to arch/arm/boot/dts/kirkwood-rd88f6281-a.dts
> 
> Changes in v2:
> 
> - patch 1: Use an hexadecimal reg property
> - patch 2: fixed the subject
> - patch 3: s/okay/disabled/ for the legacy DSA node
> - patches 7/8: fixed a stray whitespace
> 
> In about 2-3 releases we may consider removing the old DSA binding entirely
> from the kernel.

Gregory, all patches have been reviewed/tested now, can you take this
for an upcoming 4.11 pull request? Thanks!
-- 
Florian

[toc] | [prev] | [next] | [standalone]

#1563168

FromFlorian Fainelli <f.fainelli@gmail.com>
Date2017-01-19 23:50 +0100
Message-ID<t1tGN-7wg-9@gated-at.bofh.it>
In reply to#1563160
On 01/19/2017 02:48 PM, Gregory CLEMENT wrote:
> Hi Florian,
>  
>  On jeu., janv. 19 2017, Florian Fainelli <f.fainelli@gmail.com> wrote:
> 
>> On 01/17/2017 10:22 AM, Florian Fainelli wrote:
>>> Hi all,
>>>
>>> This patch series converts the in-tree users to utilize the new (relatively)
>>> DSA binding that was introduced with commit 8c5ad1d6179d ("net: dsa: Document
>>> new binding"). The legacy binding node is kept included, but is marked
>>> disabled.
>>>
>>> Changes in v3:
>>>
>>> - collected tags from Andrew and Russell
>>> - added missing change to arch/arm/boot/dts/kirkwood-rd88f6281-a.dts
>>>
>>> Changes in v2:
>>>
>>> - patch 1: Use an hexadecimal reg property
>>> - patch 2: fixed the subject
>>> - patch 3: s/okay/disabled/ for the legacy DSA node
>>> - patches 7/8: fixed a stray whitespace
>>>
>>> In about 2-3 releases we may consider removing the old DSA binding entirely
>>> from the kernel.
>>
>> Gregory, all patches have been reviewed/tested now, can you take this
>> for an upcoming 4.11 pull request? Thanks!
> 
> 
> All the series applied on mvebu/dt

Awesome, merci !
-- 
Florian

[toc] | [prev] | [next] | [standalone]

#1563169

FromGregory CLEMENT <gregory.clement@free-electrons.com>
Date2017-01-19 23:50 +0100
Message-ID<t1tGN-7wg-11@gated-at.bofh.it>
In reply to#1563160
Hi Florian,
 
 On jeu., janv. 19 2017, Florian Fainelli <f.fainelli@gmail.com> wrote:

> On 01/17/2017 10:22 AM, Florian Fainelli wrote:
>> Hi all,
>> 
>> This patch series converts the in-tree users to utilize the new (relatively)
>> DSA binding that was introduced with commit 8c5ad1d6179d ("net: dsa: Document
>> new binding"). The legacy binding node is kept included, but is marked
>> disabled.
>> 
>> Changes in v3:
>> 
>> - collected tags from Andrew and Russell
>> - added missing change to arch/arm/boot/dts/kirkwood-rd88f6281-a.dts
>> 
>> Changes in v2:
>> 
>> - patch 1: Use an hexadecimal reg property
>> - patch 2: fixed the subject
>> - patch 3: s/okay/disabled/ for the legacy DSA node
>> - patches 7/8: fixed a stray whitespace
>> 
>> In about 2-3 releases we may consider removing the old DSA binding entirely
>> from the kernel.
>
> Gregory, all patches have been reviewed/tested now, can you take this
> for an upcoming 4.11 pull request? Thanks!


All the series applied on mvebu/dt

Thanks,

Gregory


> -- 
> Florian

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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web