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

Commit 9dff6733 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

arm: dt: vf610-zii-devel-b: Make use of new DSA binding 



Hang the three switches of the three MDIO busses using the new DSA
binding. Also, make use of the mdio-bus and explicitly list the phys
on one device. This is not required, but good for testing.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 83c0afae

arch/arm/boot/dts/vf610-zii-dev-rev-b.dts

+170 −158
Original line number Diff line number Diff line
@@ -85,41 +85,17 @@ 
			reg = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

		};



		mdio_mux_2: mdio@2 {

			reg = <2>;

			#address-cells = <1>;

			#size-cells = <0>;

		};



		mdio_mux_4: mdio@4 {

			reg = <4>;

			switch0: switch0@0 {

				compatible = "marvell,mv88e6085";

				#address-cells = <1>;

				#size-cells = <0>;

		};



		mdio_mux_8: mdio@8 {

			reg = <8>;

			#address-cells = <1>;

			#size-cells = <0>;

		};

	};



	dsa {

		compatible = "marvell,dsa";

		#address-cells = <2>;

		#size-cells = <0>;

		dsa,ethernet = <&fec1>;

		dsa,mii-bus = <&mdio_mux_1>;

				reg = <0>;

				dsa,member = <0 0>;



		/* 6352 - Primary - 7 ports */

		switch0: switch@0-0 {

				ports {

					#address-cells = <1>;

					#size-cells = <0>;

			reg = <0x00 0>;

			eeprom-length = <512>;



					port@0 {

						reg = <0>;

						label = "lan0";
@@ -141,7 +117,6 @@ 
						phy-mode = "rgmii-txid";

						link = <&switch1port6

							&switch2port9>;



						fixed-link {

							speed = <1000>;

							full-duplex;
@@ -151,36 +126,47 @@ 
					port@6 {

						reg = <6>;

						label = "cpu";



						ethernet = <&fec1>;

						fixed-link {

							speed = <100>;

							full-duplex;

						};

					};



				};

			};

		};



		mdio_mux_2: mdio@2 {

			reg = <2>;

			#address-cells = <1>;

			#size-cells = <0>;



		/* 6352 - Secondary - 7 ports */

		switch1: switch@0-1 {

			switch1: switch1@0 {

				compatible = "marvell,mv88e6085";

				#address-cells = <1>;

				#size-cells = <0>;

			reg = <0x00 1>;

			eeprom-length = <512>;

			mii-bus = <&mdio_mux_2>;

				reg = <0>;

				dsa,member = <0 1>;



				ports {

					#address-cells = <1>;

					#size-cells = <0>;

					port@0 {

						reg = <0>;

						label = "lan3";

						phy-handle = <&switch1phy0>;

					};



					port@1 {

						reg = <1>;

						label = "lan4";

						phy-handle = <&switch1phy1>;

					};



					port@2 {

						reg = <2>;

						label = "lan5";

						phy-handle = <&switch1phy2>;

					};



					switch1port5: port@5 {
@@ -188,7 +174,6 @@ 
						label = "dsa";

						link = <&switch2port9>;

						phy-mode = "rgmii-txid";



						fixed-link {

							speed = <1000>;

							full-duplex;
@@ -200,21 +185,43 @@ 
						label = "dsa";

						phy-mode = "rgmii-txid";

						link = <&switch0port5>;



						fixed-link {

							speed = <1000>;

							full-duplex;

						};

					};

				};

				mdio {

					#address-cells = <1>;

					#size-cells = <0>;

					switch1phy0: switch1phy0@0 {

						reg = <0>;

					};

					switch1phy1: switch1phy0@1 {

						reg = <1>;

					};

					switch1phy2: switch1phy0@2 {

						reg = <2>;

					};

				};

			};

		};



		/* 6185 - 10 ports */

		switch2: switch@0-2 {

		mdio_mux_4: mdio@4 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x00 2>;

			mii-bus = <&mdio_mux_4>;

			reg = <4>;



			switch2: switch2@0 {

				compatible = "marvell,mv88e6085";

				#address-cells = <1>;

				#size-cells = <0>;

				reg = <0>;

				dsa,member = <0 2>;



				ports {

					#address-cells = <1>;

					#size-cells = <0>;

					port@0 {

						reg = <0>;

						label = "lan6";
@@ -233,7 +240,6 @@ 
					port@3 {

						reg = <3>;

						label = "optical3";



						fixed-link {

							speed = <1000>;

							full-duplex;
@@ -245,7 +251,6 @@ 
					port@4 {

						reg = <4>;

						label = "optical4";



						fixed-link {

							speed = <1000>;

							full-duplex;
@@ -260,7 +265,6 @@ 
						phy-mode = "rgmii-txid";

						link = <&switch1port5

							&switch0port5>;



						fixed-link {

							speed = <1000>;

							full-duplex;
@@ -268,6 +272,14 @@ 
					};

				};

			};

		};



		mdio_mux_8: mdio@8 {

			reg = <8>;

			#address-cells = <1>;

			#size-cells = <0>;

		};

	};



	reg_vcc_3v3_mcu: regulator-vcc-3v3-mcu {

		compatible = "regulator-fixed";