Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3fe1d5d authored Jan 17, 2017 by Florian Fainelli Committed by Gregory CLEMENT Jan 19, 2017

ARM: dts: kirkwood-rd88f6281: Utilize new DSA binding



Utilize the new DSA binding, introduced with commit 8c5ad1d6 ("net: dsa:
Document new binding"). The legacy binding node is kept included, but is marked
disabled.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

parent cd0cc11a

arch/arm/boot/dts/kirkwood-rd88f6281-a.dts

+4 −5

Original line number	Diff line number	Diff line
		@@ -19,11 +19,6 @@
		model = "Marvell RD88f6281 Reference design, with A0 or higher SoC";
		compatible = "marvell,rd88f6281-a", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood";

		dsa {
		switch@0 {
		reg = <10 0>; /* MDIO address 10, switch 0 in tree */
		};
		};
		};

		&mdio {
		@@ -34,6 +29,10 @@
		};
		};

		&switch {
		reg = <10>;
		};

		&eth1 {
		status = "okay";

arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts

+11 −0

Original line number	Diff line number	Diff line
		@@ -33,3 +33,14 @@
		&eth1 {
		status = "disabled";
		};

		&switch {
		reg = <0>;

		ports {
		port@4 {
		reg = <4>;
		label = "wan";
		};
		};
		};

arch/arm/boot/dts/kirkwood-rd88f6281.dtsi

+44 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,8 @@
		};

		dsa {
		status = "disabled";

		compatible = "marvell,dsa";
		#address-cells = <2>;
		#size-cells = <0>;
		@@ -115,6 +117,48 @@

		&mdio {
		status = "okay";

		switch: switch@0 {
		compatible = "marvell,mv88e6085";
		#address-cells = <1>;
		#size-cells = <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@5 {
		reg = <5>;
		label = "cpu";
		ethernet = <&eth0port>;
		fixed-link {
		speed = <1000>;
		full-duplex;
		};
		};

		};
		};
		};

		&eth0 {