[PATCH v2 2/2] powerpc/83xx: Move gianfar mdio nodes under the ethernet nodes

[Kumar Gala]

On Mar 17, 2009, at 1:59 PM, Anton Vorontsov wrote:

> 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: Scott Wood <scottwood at freescale.com>
> Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
> ---
>
> Changes since RFC:
> - Don't use compatible = "simple-bus" for gianfar nodes.
>
> arch/powerpc/boot/dts/mpc8315erdb.dts     |   80 +++++++++++++++ 
> +-------------
> arch/powerpc/boot/dts/mpc8349emitx.dts    |   69 ++++++++++++ 
> +-----------
> arch/powerpc/boot/dts/mpc8349emitxgp.dts  |   42 ++++++++-------
> arch/powerpc/boot/dts/mpc834x_mds.dts     |   81 +++++++++++++++ 
> +-------------
> arch/powerpc/boot/dts/mpc8377_mds.dts     |   80 +++++++++++++++ 
> +-------------
> arch/powerpc/boot/dts/mpc8377_rdb.dts     |   67 ++++++++++++ 
> +-----------
> arch/powerpc/boot/dts/mpc8378_mds.dts     |   80 +++++++++++++++ 
> +-------------
> arch/powerpc/boot/dts/mpc8378_rdb.dts     |   69 +++++++++++++ 
> +-----------
> arch/powerpc/boot/dts/mpc8379_mds.dts     |   79 +++++++++++++++ 
> +------------
> arch/powerpc/boot/dts/mpc8379_rdb.dts     |   66 ++++++++++++ 
> +----------
> arch/powerpc/platforms/83xx/mpc834x_itx.c |    1 +
> arch/powerpc/platforms/83xx/mpc834x_mds.c |    1 +
> arch/powerpc/platforms/83xx/mpc837x_mds.c |    1 +
> arch/powerpc/platforms/83xx/mpc837x_rdb.c |    1 +
> 14 files changed, 398 insertions(+), 319 deletions(-)

If we do this we should also fixup all the 85xx & 86xx .dts

> diff --git a/arch/powerpc/boot/dts/mpc8315erdb.dts b/arch/powerpc/ 
> boot/dts/mpc8315erdb.dts
> index 88d691c..c0d5b34 100644
> --- a/arch/powerpc/boot/dts/mpc8315erdb.dts
> +++ b/arch/powerpc/boot/dts/mpc8315erdb.dts
> @@ -190,66 +190,74 @@
> 			phy_type = "utmi";
> 		};

[snip]

>
> 		enet0: ethernet at 24000 {
> +			#address-cells = <1>;
> +			#size-cells = <1>;
> 			cell-index = <0>;
> 			device_type = "network";
> 			model = "eTSEC";
> 			compatible = "gianfar";
> 			reg = <0x24000 0x1000>;
> +			ranges;

Can this be proper?
			ranges = <0x0 0x24520 0x20>;
>
> 			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 at 24520 {
> +				#address-cells = <1>;
> +				#size-cells = <0>;
> +				compatible = "fsl,gianfar-mdio";
> +				reg = <0x24520 0x20>;

update here for ranges change.

>
> +
> +				phy0: ethernet-phy at 0 {
> +					interrupt-parent = <&ipic>;
> +					interrupts = <20 0x8>;
> +					reg = <0x0>;
> +					device_type = "ethernet-phy";
> +				};
> +
> +				phy1: ethernet-phy at 1 {
> +					interrupt-parent = <&ipic>;
> +					interrupts = <19 0x8>;
> +					reg = <0x1>;
> +					device_type = "ethernet-phy";
> +				};
> +
> +				tbi0: tbi-phy at 11 {
> +					reg = <0x11>;
> +					device_type = "tbi-phy";
> +				};
> +			};
> 		};

- k