Commit 260bcbb3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt-5.1-1' of git://git.infradead.org/linux-mvebu into arm/dt 

mvebu dt for 5.1 (part 1)

 - Cleanup marvell,dsa properties

* tag 'mvebu-dt-5.1-1' of git://git.infradead.org/linux-mvebu

:
  arch: arm: dts: Remove disabled marvell,dsa properties

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1c295056 cb92e404

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

+0 −42
Original line number Diff line number Diff line
@@ -114,48 +114,6 @@ 
			};

		};

	};



	dsa {

		status = "disabled";



		compatible = "marvell,dsa";

		#address-cells = <2>;

		#size-cells = <0>;



		dsa,ethernet = <&eth1>;

		dsa,mii-bus = <&mdio>;



		switch@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x10 0>;	/* MDIO address 16, switch 0 in tree */



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

			};

		};

	 };

};



&pciec {

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

+0 −58
Original line number Diff line number Diff line
@@ -30,64 +30,6 @@ 
		};

	};



	dsa@0 {

		status = "disabled";



		compatible = "marvell,dsa";

		dsa,ethernet = <&eth1>;

		dsa,mii-bus = <&mdio>;

		pinctrl-0 = <&clearfog_dsa0_clk_pins &clearfog_dsa0_pins>;

		pinctrl-names = "default";

		#address-cells = <2>;

		#size-cells = <0>;



		switch@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <4 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";

			};



			port@6 {

				/* 88E1512 external phy */

				reg = <6>;

				label = "lan6";

				fixed-link {

					speed = <1000>;

					full-duplex;

				};

			};

		};

	};



	gpio-keys {

		compatible = "gpio-keys";

		pinctrl-0 = <&rear_button_pins>;

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

+0 −47
Original line number Diff line number Diff line
@@ -210,53 +210,6 @@ 
		compatible = "pwm-fan";

		pwms = <&gpio0 24 4000>;

	};



	dsa {

		status = "disabled";



		compatible = "marvell,dsa";

		#address-cells = <2>;

		#size-cells = <0>;



		dsa,ethernet = <&eth0>;

		dsa,mii-bus = <&mdio>;



		switch@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x0 0>;	/* MDIO address 0, switch 0 in tree */



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

			};

		};

	};

};



&pciec {

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

+0 −47
Original line number Diff line number Diff line
@@ -190,53 +190,6 @@ 
			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;

		};

	};



	dsa {

		status = "disabled";



		compatible = "marvell,dsa";

		#address-cells = <2>;

		#size-cells = <0>;



		dsa,ethernet = <&eth0port>;

		dsa,mii-bus = <&mdio>;



		switch@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0 0>;	/* MDIO address 0, switch 0 in tree */



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

			};

		};

	};

};



&mdio {

arch/arm/boot/dts/kirkwood-linksys-viper.dts

+0 −47
Original line number Diff line number Diff line
@@ -66,53 +66,6 @@ 
			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;

		};

	};



	dsa {

		status = "disabled";



		compatible = "marvell,dsa";

		#address-cells = <2>;

		#size-cells = <0>;



		dsa,ethernet = <&eth0port>;

		dsa,mii-bus = <&mdio>;



		switch@16,0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <16 0>;	/* MDIO address 16, switch 0 in tree */



			port@0 {

				reg = <0>;

				label = "ethernet1";

			};



			port@1 {

				reg = <1>;

				label = "ethernet2";

			};



			port@2 {

				reg = <2>;

				label = "ethernet3";

			};



			port@3 {

				reg = <3>;

				label = "ethernet4";

			};



			port@4 {

				reg = <4>;

				label = "internet";

			};



			port@5 {

				reg = <5>;

				label = "cpu";

			};

		};

	};

};



&pinctrl {

CRA Git | Maintained and supported by SUSTech CRA and CCSE