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

Commit 70b3adbb authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Kumar Gala
Browse files

powerpc/83xx: Move gianfar mdio nodes under the ethernet nodes 



Currently it doesn't matter where the mdio nodes are placed, but with
power management support (i.e. when sleep = <> properties will take
effect), mdio nodes placement will become important: mdio controller
is a part of the ethernet block, so the mdio nodes should be placed
correctly. Otherwise we may wrongly assume that MDIO controllers are
available during sleep.

Suggested-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 125a00d7

arch/powerpc/boot/dts/asp834x-redboot.dts

+44 −38
Original line number Diff line number Diff line
@@ -181,11 +181,27 @@ 
			phy_type = "ulpi";

		};



		mdio@24520 {

		enet0: ethernet@24000 {

			#address-cells = <1>;

			#size-cells = <1>;

			cell-index = <0>;

			device_type = "network";

			model = "TSEC";

			compatible = "gianfar";

			reg = <0x24000 0x1000>;

			ranges = <0x0 0x24000 0x1000>;

			local-mac-address = [ 00 08 e5 11 32 33 ];

			interrupts = <32 0x8 33 0x8 34 0x8>;

			interrupt-parent = <&ipic>;

			tbi-handle = <&tbi0>;

			phy-handle = <&phy0>;

			linux,network-index = <0>;



			mdio@520 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,gianfar-mdio";

			reg = <0x24520 0x20>;

				reg = <0x520 0x20>;



				phy0: ethernet-phy@0 {

					interrupt-parent = <&ipic>;
@@ -193,6 +209,7 @@ 
					reg = <0x1>;

					device_type = "ethernet-phy";

				};



				phy1: ethernet-phy@1 {

					interrupt-parent = <&ipic>;

					interrupts = <18 0x8>;
@@ -205,46 +222,35 @@ 
					device_type = "tbi-phy";

				};

			};



		mdio@25520 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "fsl,gianfar-tbi";

			reg = <0x25520 0x20>;



			tbi1: tbi-phy@11 {

				reg = <0x11>;

				device_type = "tbi-phy";

			};

		};





		enet0: ethernet@24000 {

			cell-index = <0>;

			device_type = "network";

			model = "TSEC";

			compatible = "gianfar";

			reg = <0x24000 0x1000>;

			local-mac-address = [ 00 08 e5 11 32 33 ];

			interrupts = <32 0x8 33 0x8 34 0x8>;

			interrupt-parent = <&ipic>;

			tbi-handle = <&tbi0>;

			phy-handle = <&phy0>;

			linux,network-index = <0>;

		};



		enet1: ethernet@25000 {

			#address-cells = <1>;

			#size-cells = <1>;

			cell-index = <1>;

			device_type = "network";

			model = "TSEC";

			compatible = "gianfar";

			reg = <0x25000 0x1000>;

			ranges = <0x0 0x25000 0x1000>;

			local-mac-address = [ 00 08 e5 11 32 34 ];

			interrupts = <35 0x8 36 0x8 37 0x8>;

			interrupt-parent = <&ipic>;

			tbi-handle = <&tbi1>;

			phy-handle = <&phy1>;

			linux,network-index = <1>;



			mdio@520 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,gianfar-tbi";

				reg = <0x520 0x20>;



				tbi1: tbi-phy@11 {

					reg = <0x11>;

					device_type = "tbi-phy";

				};

			};

		};



		serial0: serial@4500 {

arch/powerpc/boot/dts/mpc8315erdb.dts

+44 −36
Original line number Diff line number Diff line
@@ -190,66 +190,74 @@ 
			phy_type = "utmi";

		};



		mdio@24520 {

		enet0: ethernet@24000 {

			#address-cells = <1>;

			#size-cells = <1>;

			cell-index = <0>;

			device_type = "network";

			model = "eTSEC";

			compatible = "gianfar";

			reg = <0x24000 0x1000>;

			ranges = <0x0 0x24000 0x1000>;

			local-mac-address = [ 00 00 00 00 00 00 ];

			interrupts = <32 0x8 33 0x8 34 0x8>;

			interrupt-parent = <&ipic>;

			tbi-handle = <&tbi0>;

			phy-handle = < &phy0 >;



			mdio@520 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,gianfar-mdio";

			reg = <0x24520 0x20>;

				reg = <0x520 0x20>;



				phy0: ethernet-phy@0 {

					interrupt-parent = <&ipic>;

					interrupts = <20 0x8>;

					reg = <0x0>;

					device_type = "ethernet-phy";

				};



				phy1: ethernet-phy@1 {

					interrupt-parent = <&ipic>;

					interrupts = <19 0x8>;

					reg = <0x1>;

					device_type = "ethernet-phy";

				};

			tbi0: tbi-phy@11 {

				reg = <0x11>;

				device_type = "tbi-phy";

			};

		};



		mdio@25520 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "fsl,gianfar-tbi";

			reg = <0x25520 0x20>;



			tbi1: tbi-phy@11 {

				tbi0: tbi-phy@11 {

					reg = <0x11>;

					device_type = "tbi-phy";

				};

			};





		enet0: ethernet@24000 {

			cell-index = <0>;

			device_type = "network";

			model = "eTSEC";

			compatible = "gianfar";

			reg = <0x24000 0x1000>;

			local-mac-address = [ 00 00 00 00 00 00 ];

			interrupts = <32 0x8 33 0x8 34 0x8>;

			interrupt-parent = <&ipic>;

			tbi-handle = <&tbi0>;

			phy-handle = < &phy0 >;

		};



		enet1: ethernet@25000 {

			#address-cells = <1>;

			#size-cells = <1>;

			cell-index = <1>;

			device_type = "network";

			model = "eTSEC";

			compatible = "gianfar";

			reg = <0x25000 0x1000>;

			ranges = <0x0 0x25000 0x1000>;

			local-mac-address = [ 00 00 00 00 00 00 ];

			interrupts = <35 0x8 36 0x8 37 0x8>;

			interrupt-parent = <&ipic>;

			tbi-handle = <&tbi1>;

			phy-handle = < &phy1 >;



			mdio@520 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,gianfar-tbi";

				reg = <0x520 0x20>;



				tbi1: tbi-phy@11 {

					reg = <0x11>;

					device_type = "tbi-phy";

				};

			};

		};



		serial0: serial@4500 {

arch/powerpc/boot/dts/mpc8349emitx.dts

+38 −31
Original line number Diff line number Diff line
@@ -170,11 +170,27 @@ 
			phy_type = "ulpi";

		};



		mdio@24520 {

		enet0: ethernet@24000 {

			#address-cells = <1>;

			#size-cells = <1>;

			cell-index = <0>;

			device_type = "network";

			model = "TSEC";

			compatible = "gianfar";

			reg = <0x24000 0x1000>;

			ranges = <0x0 0x24000 0x1000>;

			local-mac-address = [ 00 00 00 00 00 00 ];

			interrupts = <32 0x8 33 0x8 34 0x8>;

			interrupt-parent = <&ipic>;

			tbi-handle = <&tbi0>;

			phy-handle = <&phy1c>;

			linux,network-index = <0>;



			mdio@520 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,gianfar-mdio";

			reg = <0x24520 0x20>;

				reg = <0x520 0x20>;



				/* Vitesse 8201 */

				phy1c: ethernet-phy@1c {
@@ -183,44 +199,23 @@ 
					reg = <0x1c>;

					device_type = "ethernet-phy";

				};



				tbi0: tbi-phy@11 {

					reg = <0x11>;

					device_type = "tbi-phy";

				};

			};



		mdio@25520 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "fsl,gianfar-tbi";

			reg = <0x25520 0x20>;



			tbi1: tbi-phy@11 {

				reg = <0x11>;

				device_type = "tbi-phy";

			};

		};



		enet0: ethernet@24000 {

			cell-index = <0>;

			device_type = "network";

			model = "TSEC";

			compatible = "gianfar";

			reg = <0x24000 0x1000>;

			local-mac-address = [ 00 00 00 00 00 00 ];

			interrupts = <32 0x8 33 0x8 34 0x8>;

			interrupt-parent = <&ipic>;

			tbi-handle = <&tbi0>;

			phy-handle = <&phy1c>;

			linux,network-index = <0>;

		};



		enet1: ethernet@25000 {

			#address-cells = <1>;

			#size-cells = <1>;

			cell-index = <1>;

			device_type = "network";

			model = "TSEC";

			compatible = "gianfar";

			reg = <0x25000 0x1000>;

			ranges = <0x0 0x25000 0x1000>;

			local-mac-address = [ 00 00 00 00 00 00 ];

			interrupts = <35 0x8 36 0x8 37 0x8>;

			interrupt-parent = <&ipic>;
@@ -228,6 +223,18 @@ 
			fixed-link = <1 1 1000 0 0>;

			linux,network-index = <1>;

			tbi-handle = <&tbi1>;



			mdio@520 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,gianfar-tbi";

				reg = <0x520 0x20>;



				tbi1: tbi-phy@11 {

					reg = <0x11>;

					device_type = "tbi-phy";

				};

			};

		};



		serial0: serial@4500 {

arch/powerpc/boot/dts/mpc8349emitxgp.dts

+23 −19
Original line number Diff line number Diff line
@@ -149,11 +149,27 @@ 
			phy_type = "ulpi";

		};



		mdio@24520 {

		enet0: ethernet@24000 {

			#address-cells = <1>;

			#size-cells = <1>;

			cell-index = <0>;

			device_type = "network";

			model = "TSEC";

			compatible = "gianfar";

			reg = <0x24000 0x1000>;

			ranges = <0x0 0x24000 0x1000>;

			local-mac-address = [ 00 00 00 00 00 00 ];

			interrupts = <32 0x8 33 0x8 34 0x8>;

			interrupt-parent = <&ipic>;

			tbi-handle = <&tbi0>;

			phy-handle = <&phy1c>;

			linux,network-index = <0>;



			mdio@520 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,gianfar-mdio";

			reg = <0x24520 0x20>;

				reg = <0x520 0x20>;



				/* Vitesse 8201 */

				phy1c: ethernet-phy@1c {
@@ -162,24 +178,12 @@ 
					reg = <0x1c>;

					device_type = "ethernet-phy";

				};



				tbi0: tbi-phy@11 {

					reg = <0x11>;

					device_type = "tbi-phy";

				};

			};



		enet0: ethernet@24000 {

			cell-index = <0>;

			device_type = "network";

			model = "TSEC";

			compatible = "gianfar";

			reg = <0x24000 0x1000>;

			local-mac-address = [ 00 00 00 00 00 00 ];

			interrupts = <32 0x8 33 0x8 34 0x8>;

			interrupt-parent = <&ipic>;

			tbi-handle = <&tbi0>;

			phy-handle = <&phy1c>;

			linux,network-index = <0>;

		};



		serial0: serial@4500 {

arch/powerpc/boot/dts/mpc834x_mds.dts

+44 −37
Original line number Diff line number Diff line
@@ -167,11 +167,27 @@ 
			phy_type = "ulpi";

		};



		mdio@24520 {

		enet0: ethernet@24000 {

			#address-cells = <1>;

			#size-cells = <1>;

			cell-index = <0>;

			device_type = "network";

			model = "TSEC";

			compatible = "gianfar";

			reg = <0x24000 0x1000>;

			ranges = <0x0 0x24000 0x1000>;

			local-mac-address = [ 00 00 00 00 00 00 ];

			interrupts = <32 0x8 33 0x8 34 0x8>;

			interrupt-parent = <&ipic>;

			tbi-handle = <&tbi0>;

			phy-handle = <&phy0>;

			linux,network-index = <0>;



			mdio@520 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,gianfar-mdio";

			reg = <0x24520 0x20>;

				reg = <0x520 0x20>;



				phy0: ethernet-phy@0 {

					interrupt-parent = <&ipic>;
@@ -179,57 +195,48 @@ 
					reg = <0x0>;

					device_type = "ethernet-phy";

				};



				phy1: ethernet-phy@1 {

					interrupt-parent = <&ipic>;

					interrupts = <18 0x8>;

					reg = <0x1>;

					device_type = "ethernet-phy";

				};



				tbi0: tbi-phy@11 {

					reg = <0x11>;

					device_type = "tbi-phy";

				};

			};



		mdio@25520 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "fsl,gianfar-tbi";

			reg = <0x25520 0x20>;



			tbi1: tbi-phy@11 {

				reg = <0x11>;

				device_type = "tbi-phy";

			};

		};





		enet0: ethernet@24000 {

			cell-index = <0>;

			device_type = "network";

			model = "TSEC";

			compatible = "gianfar";

			reg = <0x24000 0x1000>;

			local-mac-address = [ 00 00 00 00 00 00 ];

			interrupts = <32 0x8 33 0x8 34 0x8>;

			interrupt-parent = <&ipic>;

			tbi-handle = <&tbi0>;

			phy-handle = <&phy0>;

			linux,network-index = <0>;

		};



		enet1: ethernet@25000 {

			#address-cells = <1>;

			#size-cells = <1>;

			cell-index = <1>;

			device_type = "network";

			model = "TSEC";

			compatible = "gianfar";

			reg = <0x25000 0x1000>;

			ranges = <0x0 0x25000 0x1000>;

			local-mac-address = [ 00 00 00 00 00 00 ];

			interrupts = <35 0x8 36 0x8 37 0x8>;

			interrupt-parent = <&ipic>;

			tbi-handle = <&tbi1>;

			phy-handle = <&phy1>;

			linux,network-index = <1>;



			mdio@520 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,gianfar-tbi";

				reg = <0x520 0x20>;



				tbi1: tbi-phy@11 {

					reg = <0x11>;

					device_type = "tbi-phy";

				};

			};

		};



		serial0: serial@4500 {