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

Commit 3c63c24d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-dt-4.11-2' of git://git.infradead.org/linux-mvebu into next/dt 

mvebu dt for 4.11 (part 2)

Switch device tree files to the new DSA binding

* tag 'mvebu-dt-4.11-2' of git://git.infradead.org/linux-mvebu

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

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents b7441582 a3fe1d5d

arch/arm/boot/dts/armada-370-rd.dts

+44 −0
Original line number Diff line number Diff line
@@ -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;

				};

			};

		};

	};

};

arch/arm/boot/dts/armada-385-linksys.dtsi

+51 −1
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/armada-388-clearfog.dts

+65 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ 
	};



	dsa@0 {

		status = "disabled";



		compatible = "marvell,dsa";

		dsa,ethernet = <&eth1>;

		dsa,mii-bus = <&mdio>;
@@ -203,6 +205,69 @@ 
	};

};



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

				};

			};

		};

	};

};



&spi1 {

	/*

	 * Add SPI CS pins for clearfog:

arch/arm/boot/dts/armada-xp-linksys-mamba.dts

+53 −0
Original line number Diff line number Diff line
@@ -302,6 +302,8 @@ 
	};



	dsa {

		status = "disabled";



		compatible = "marvell,dsa";

		#address-cells = <2>;

		#size-cells = <0>;
@@ -398,3 +400,54 @@ 
		spi-max-frequency = <40000000>;

	};

};



&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 = "lan4";

			};



			port@1 {

				reg = <1>;

				label = "lan3";

			};



			port@2 {

				reg = <2>;

				label = "lan2";

			};



			port@3 {

				reg = <3>;

				label = "lan1";

			};



			port@4 {

				reg = <4>;

				label = "internet";

			};



			port@5 {

				reg = <5>;

				label = "cpu";

				ethernet = <&eth0>;

				fixed-link {

					speed = <1000>;

					full-duplex;

				};

			};

		};

	};

};

arch/arm/boot/dts/kirkwood-dir665.dts

+49 −0
Original line number Diff line number Diff line
@@ -194,6 +194,8 @@ 
	};



	dsa {

		status = "disabled";



		compatible = "marvell,dsa";

		#address-cells = <2>;

		#size-cells = <0>;
@@ -241,6 +243,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 = "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@6 {

				reg = <6>;

				label = "cpu";

				ethernet = <&eth0port>;

				fixed-link {

					speed = <1000>;

					full-duplex;

				};

			};

		};

	};

};



/* eth0 is connected to a Marvell 88E6171 switch, without a PHY. So set