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

Commit e77b28eb authored by Kumar Gala's avatar Kumar Gala
Browse files

[POWERPC] FSL: enet device tree cleanups 



* Removed address fields in ethernet nodes
* Removed #address-cells, #size-cells from gianfar nodes
* Added cell-index to gianfar and ucc ethernet nodes
* Added enet[0..3] labels
* Renamed compatible node for gianfar mdio to "fsl,gianfar-mdio"
* Removed device_type = "mdio"

The matching for gianfar mdio still supports the old "mdio"/"gianfar" combo
but it is now considered deprecated.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent ec9686c4

Documentation/powerpc/booting-without-of.txt

+2 −4
Original line number Original line Diff line number Diff line
@@ -1223,16 +1223,14 @@ platforms are moved over to use the flattened-device-tree model. 




  Required properties:

  Required properties:

    - reg : Offset and length of the register set for the device

    - reg : Offset and length of the register set for the device

    - device_type : Should be "mdio"

    - compatible : Should define the compatible device type for the

    - compatible : Should define the compatible device type for the

      mdio.  Currently, this is most likely to be "gianfar"

      mdio.  Currently, this is most likely to be "fsl,gianfar-mdio"





  Example:

  Example:





	mdio@24520 {

	mdio@24520 {

		reg = <24520 20>;

		reg = <24520 20>;

		device_type = "mdio"; 

		compatible = "fsl,gianfar-mdio";

		compatible = "gianfar";





		ethernet-phy@0 {

		ethernet-phy@0 {

			......

			......

arch/powerpc/boot/dts/mpc8313erdb.dts

+6 −5
Original line number Original line Diff line number Diff line
@@ -95,11 +95,10 @@ 
		};

		};





		mdio@24520 {

		mdio@24520 {

			device_type = "mdio";

			compatible = "gianfar";

			reg = <24520 20>;

			#address-cells = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			#size-cells = <0>;

			compatible = "fsl,gianfar-mdio";

			reg = <24520 20>;

			phy1: ethernet-phy@1 {

			phy1: ethernet-phy@1 {

				interrupt-parent = < &ipic >;

				interrupt-parent = < &ipic >;

				interrupts = <13 8>;

				interrupts = <13 8>;
@@ -114,7 +113,8 @@ 
			};

			};

		};

		};





		ethernet@24000 {

		enet0: ethernet@24000 {

			cell-index = <0>;

			device_type = "network";

			device_type = "network";

			model = "eTSEC";

			model = "eTSEC";

			compatible = "gianfar";

			compatible = "gianfar";
@@ -125,7 +125,8 @@ 
			phy-handle = < &phy1 >;

			phy-handle = < &phy1 >;

		};

		};





		ethernet@25000 {

		enet1: ethernet@25000 {

			cell-index = <1>;

			device_type = "network";

			device_type = "network";

			model = "eTSEC";

			model = "eTSEC";

			compatible = "gianfar";

			compatible = "gianfar";

arch/powerpc/boot/dts/mpc832x_mds.dts

+4 −14
Original line number Original line Diff line number Diff line
@@ -208,20 +208,15 @@ 
			mode = "slave";

			mode = "slave";

		};

		};





		ucc@2200 {

		enet0: ucc@2200 {

			device_type = "network";

			device_type = "network";

			compatible = "ucc_geth";

			compatible = "ucc_geth";

			model = "UCC";

			model = "UCC";

			cell-index = <3>;

			device-id = <3>;

			device-id = <3>;

			reg = <2200 200>;

			reg = <2200 200>;

			interrupts = <22>;

			interrupts = <22>;

			interrupt-parent = < &qeic >;

			interrupt-parent = < &qeic >;

			/*

			 * mac-address is deprecated and will be removed

			 * in 2.6.25.  Only recent versions of

			 * U-Boot support local-mac-address, however.

			 */

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

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

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

			rx-clock = <19>;

			rx-clock = <19>;

			tx-clock = <1a>;

			tx-clock = <1a>;
@@ -229,20 +224,15 @@ 
			pio-handle = < &pio3 >;

			pio-handle = < &pio3 >;

		};

		};





		ucc@3200 {

		enet1: ucc@3200 {

			device_type = "network";

			device_type = "network";

			compatible = "ucc_geth";

			compatible = "ucc_geth";

			model = "UCC";

			model = "UCC";

			cell-index = <4>;

			device-id = <4>;

			device-id = <4>;

			reg = <3200 200>;

			reg = <3200 200>;

			interrupts = <23>;

			interrupts = <23>;

			interrupt-parent = < &qeic >;

			interrupt-parent = < &qeic >;

			/*

			 * mac-address is deprecated and will be removed

			 * in 2.6.25.  Only recent versions of

			 * U-Boot support local-mac-address, however.

			 */

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

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

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

			rx-clock = <17>;

			rx-clock = <17>;

			tx-clock = <18>;

			tx-clock = <18>;

arch/powerpc/boot/dts/mpc832x_rdb.dts

+4 −14
Original line number Original line Diff line number Diff line
@@ -189,20 +189,15 @@ 
			mode = "cpu";

			mode = "cpu";

		};

		};





		ucc@3000 {

		enet0: ucc@3000 {

			device_type = "network";

			device_type = "network";

			compatible = "ucc_geth";

			compatible = "ucc_geth";

			model = "UCC";

			model = "UCC";

			cell-index = <2>;

			device-id = <2>;

			device-id = <2>;

			reg = <3000 200>;

			reg = <3000 200>;

			interrupts = <21>;

			interrupts = <21>;

			interrupt-parent = <&qeic>;

			interrupt-parent = <&qeic>;

			/*

			 * mac-address is deprecated and will be removed

			 * in 2.6.25.  Only recent versions of

			 * U-Boot support local-mac-address, however.

			 */

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

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

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

			rx-clock = <20>;

			rx-clock = <20>;

			tx-clock = <13>;

			tx-clock = <13>;
@@ -210,20 +205,15 @@ 
			pio-handle = <&ucc2pio>;

			pio-handle = <&ucc2pio>;

		};

		};





		ucc@2200 {

		enet1: ucc@2200 {

			device_type = "network";

			device_type = "network";

			compatible = "ucc_geth";

			compatible = "ucc_geth";

			model = "UCC";

			model = "UCC";

			cell-index = <3>;

			device-id = <3>;

			device-id = <3>;

			reg = <2200 200>;

			reg = <2200 200>;

			interrupts = <22>;

			interrupts = <22>;

			interrupt-parent = <&qeic>;

			interrupt-parent = <&qeic>;

			/*

			 * mac-address is deprecated and will be removed

			 * in 2.6.25.  Only recent versions of

			 * U-Boot support local-mac-address, however.

			 */

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

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

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

			rx-clock = <19>;

			rx-clock = <19>;

			tx-clock = <1a>;

			tx-clock = <1a>;

arch/powerpc/boot/dts/mpc8349emitx.dts

+6 −19
Original line number Original line Diff line number Diff line
@@ -106,11 +106,10 @@ 
		};

		};





		mdio@24520 {

		mdio@24520 {

			device_type = "mdio";

			compatible = "gianfar";

			reg = <24520 20>;

			#address-cells = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			#size-cells = <0>;

			compatible = "fsl,gianfar-mdio";

			reg = <24520 20>;





			/* Vitesse 8201 */

			/* Vitesse 8201 */

			phy1c: ethernet-phy@1c {

			phy1c: ethernet-phy@1c {
@@ -129,17 +128,12 @@ 
			};

			};

		};

		};





		ethernet@24000 {

		enet0: ethernet@24000 {

			cell-index = <0>;

			device_type = "network";

			device_type = "network";

			model = "TSEC";

			model = "TSEC";

			compatible = "gianfar";

			compatible = "gianfar";

			reg = <24000 1000>;

			reg = <24000 1000>;

			/*

			 * address is deprecated and will be removed

			 * in 2.6.25.  Only recent versions of

			 * U-Boot support local-mac-address, however.

			 */

			address = [ 00 00 00 00 00 00 ];

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

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

			interrupts = <20 8 21 8 22 8>;

			interrupts = <20 8 21 8 22 8>;

			interrupt-parent = < &ipic >;

			interrupt-parent = < &ipic >;
@@ -147,19 +141,12 @@ 
			linux,network-index = <0>;

			linux,network-index = <0>;

		};

		};





		ethernet@25000 {

		enet1: ethernet@25000 {

			#address-cells = <1>;

			cell-index = <1>;

			#size-cells = <0>;

			device_type = "network";

			device_type = "network";

			model = "TSEC";

			model = "TSEC";

			compatible = "gianfar";

			compatible = "gianfar";

			reg = <25000 1000>;

			reg = <25000 1000>;

			/*

			 * address is deprecated and will be removed

			 * in 2.6.25.  Only recent versions of

			 * U-Boot support local-mac-address, however.

			 */

			address = [ 00 00 00 00 00 00 ];

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

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

			interrupts = <23 8 24 8 25 8>;

			interrupts = <23 8 24 8 25 8>;

			interrupt-parent = < &ipic >;

			interrupt-parent = < &ipic >;