[PATCH] Add aliases node to 8641hpcn DTS file.

[PATCH] Add aliases node to 8641hpcn DTS file.

[Jon Loeliger]

The addition of the aliases node is needed for U-Boot
and, eventually, cuImage, to help locate the proper
nodes reliably when using the libfdt approach.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
---
 arch/powerpc/boot/dts/mpc8641_hpcn.dts |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index abb26dc..b039f21 100644
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -16,6 +16,17 @@
 	#address-cells = <1>;
 	#size-cells = <1>;
 
+	aliases {
+		ethernet0 = &enet0;
+		ethernet1 = &enet1;
+		ethernet2 = &enet2;
+		ethernet3 = &enet3;
+		serial0 = &serial0;
+		serial1 = &serial1;
+		pci0 = &pci0;
+		pci1 = &pci1;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -107,7 +118,7 @@
 			};
 		};
 
-		ethernet@24000 {
+		enet0: ethernet@24000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 			device_type = "network";
@@ -127,7 +138,7 @@
 			phy-connection-type = "rgmii-id";
 		};
 
-		ethernet@25000 {
+		enet1: ethernet@25000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 			device_type = "network";
@@ -147,7 +158,7 @@
 			phy-connection-type = "rgmii-id";
 		};
 		
-		ethernet@26000 {
+		enet2: ethernet@26000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 			device_type = "network";
@@ -167,7 +178,7 @@
 			phy-connection-type = "rgmii-id";
 		};
 
-		ethernet@27000 {
+		enet3: ethernet@27000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 			device_type = "network";
@@ -186,7 +197,8 @@
 			phy-handle = <&phy3>;
 			phy-connection-type = "rgmii-id";
 		};
-		serial@4500 {
+
+		serial0: serial@4500 {
 			device_type = "serial";
 			compatible = "ns16550";
 			reg = <4500 100>;
@@ -195,7 +207,7 @@
 			interrupt-parent = <&mpic>;
 		};
 
-		serial@4600 {
+		serial1: serial@4600 {
 			device_type = "serial";
 			compatible = "ns16550";
 			reg = <4600 100>;
@@ -222,7 +234,7 @@
 		};
 	};
 
-	pcie@f8008000 {
+	pci0: pcie@f8008000 {
 		compatible = "fsl,mpc8641-pcie";
 		device_type = "pci";
 		#interrupt-cells = <1>;
@@ -430,7 +442,7 @@
 
 	};
 
-	pcie@f8009000 {
+	pci1: pcie@f8009000 {
 		compatible = "fsl,mpc8641-pcie";
 		device_type = "pci";
 		#interrupt-cells = <1>;
-- 
1.5.2.1.126.g6abd0

Re: [PATCH] Add aliases node to 8641hpcn DTS file.

[Grant Likely]

On 12/5/07, Jon Loeliger <jdl@freescale.com> wrote:
>
> The addition of the aliases node is needed for U-Boot
> and, eventually, cuImage, to help locate the proper
> nodes reliably when using the libfdt approach.
>
> Signed-off-by: Jon Loeliger <jdl@freescale.com>
> ---
>  arch/powerpc/boot/dts/mpc8641_hpcn.dts |   28 ++++++++++++++++++++--------
>  1 files changed, 20 insertions(+), 8 deletions(-)
>
> diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
> index abb26dc..b039f21 100644
> --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
> +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
> @@ -16,6 +16,17 @@
>         #address-cells = <1>;
>         #size-cells = <1>;
>
> +       aliases {
> +               ethernet0 = &enet0;
> +               ethernet1 = &enet1;
> +               ethernet2 = &enet2;
> +               ethernet3 = &enet3;
> +               serial0 = &serial0;
> +               serial1 = &serial1;
> +               pci0 = &pci0;
> +               pci1 = &pci1;
> +       };

I had thought aliases were supposed to be full paths to nodes instead
of phandles.  Was I wrong?

> +
>         cpus {
>                 #address-cells = <1>;
>                 #size-cells = <0>;
> @@ -107,7 +118,7 @@
>                         };
>                 };
>
> -               ethernet@24000 {
> +               enet0: ethernet@24000 {
>                         #address-cells = <1>;
>                         #size-cells = <0>;
>                         device_type = "network";
> @@ -127,7 +138,7 @@
>                         phy-connection-type = "rgmii-id";
>                 };
>
> -               ethernet@25000 {
> +               enet1: ethernet@25000 {
>                         #address-cells = <1>;
>                         #size-cells = <0>;
>                         device_type = "network";
> @@ -147,7 +158,7 @@
>                         phy-connection-type = "rgmii-id";
>                 };
>
> -               ethernet@26000 {
> +               enet2: ethernet@26000 {
>                         #address-cells = <1>;
>                         #size-cells = <0>;
>                         device_type = "network";
> @@ -167,7 +178,7 @@
>                         phy-connection-type = "rgmii-id";
>                 };
>
> -               ethernet@27000 {
> +               enet3: ethernet@27000 {
>                         #address-cells = <1>;
>                         #size-cells = <0>;
>                         device_type = "network";
> @@ -186,7 +197,8 @@
>                         phy-handle = <&phy3>;
>                         phy-connection-type = "rgmii-id";
>                 };
> -               serial@4500 {
> +
> +               serial0: serial@4500 {
>                         device_type = "serial";
>                         compatible = "ns16550";
>                         reg = <4500 100>;
> @@ -195,7 +207,7 @@
>                         interrupt-parent = <&mpic>;
>                 };
>
> -               serial@4600 {
> +               serial1: serial@4600 {
>                         device_type = "serial";
>                         compatible = "ns16550";
>                         reg = <4600 100>;
> @@ -222,7 +234,7 @@
>                 };
>         };
>
> -       pcie@f8008000 {
> +       pci0: pcie@f8008000 {
>                 compatible = "fsl,mpc8641-pcie";
>                 device_type = "pci";
>                 #interrupt-cells = <1>;
> @@ -430,7 +442,7 @@
>
>         };
>
> -       pcie@f8009000 {
> +       pci1: pcie@f8009000 {
>                 compatible = "fsl,mpc8641-pcie";
>                 device_type = "pci";
>                 #interrupt-cells = <1>;
> --
> 1.5.2.1.126.g6abd0
>
>
>
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev
>


-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
grant.likely@secretlab.ca
(403) 399-0195

Re: [PATCH] Add aliases node to 8641hpcn DTS file.

[Jon Loeliger]

On Wed, 2007-12-05 at 11:38, Grant Likely wrote:

> >
> > +       aliases {
> > +               ethernet0 = &enet0;
> > +               ethernet1 = &enet1;
> > +               ethernet2 = &enet2;
> > +               ethernet3 = &enet3;
> > +               serial0 = &serial0;
> > +               serial1 = &serial1;
> > +               pci0 = &pci0;
> > +               pci1 = &pci1;
> > +       };
> 
> I had thought aliases were supposed to be full paths to nodes instead
> of phandles.  Was I wrong?

Indeed, that is correct.  And they are!

=> fdt addr c00000
=> fdt print /aliases
aliases {
        ethernet0 = "/soc8641@f8000000/ethernet@24000";
        ethernet1 = "/soc8641@f8000000/ethernet@25000";
        ethernet2 = "/soc8641@f8000000/ethernet@26000";
        ethernet3 = "/soc8641@f8000000/ethernet@27000";
        serial0 = "/soc8641@f8000000/serial@4500";
        serial1 = "/soc8641@f8000000/serial@4600";
        pci0 = "/pcie@f8008000";
        pci1 = "/pcie@f8009000";
};
=> bootm 1000000 - c00000

Grant, you need to keep up, man.  Just this morning
I pushed Gibson's patch to DTC to support this. :-)

jdl

Re: [PATCH] Add aliases node to 8641hpcn DTS file.

[Vitaly Bordug]

On Wed, 5 Dec 2007 10:38:38 -0700
Grant Likely wrote:

> >
> > +       aliases {
> > +               ethernet0 = &enet0;
> > +               ethernet1 = &enet1;
> > +               ethernet2 = &enet2;
> > +               ethernet3 = &enet3;
> > +               serial0 = &serial0;
> > +               serial1 = &serial1;
> > +               pci0 = &pci0;
> > +               pci1 = &pci1;
> > +       };  
> 
> I had thought aliases were supposed to be full paths to nodes instead
> of phandles.  Was I wrong?
no, but dwg did a patch for dtc to do that dirty work for you, resolving labels. I am also curious if such a change made it in
dtc git (working with full path aliases now). dtc should prolly get tagged and next sub-rev to be clear if it supports aliases or not.

-- 
Sincerely, Vitaly

Re: [PATCH] Add aliases node to 8641hpcn DTS file.

[Grant Likely]

On 12/5/07, Jon Loeliger <jdl@freescale.com> wrote:
> On Wed, 2007-12-05 at 11:38, Grant Likely wrote:
> > I had thought aliases were supposed to be full paths to nodes instead
> > of phandles.  Was I wrong?
>
> Indeed, that is correct.  And they are!
>
> Grant, you need to keep up, man.  Just this morning
> I pushed Gibson's patch to DTC to support this. :-)

Heh; I'm so behind.  Thanks for the clarification.

g.


-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
grant.likely@secretlab.ca
(403) 399-0195

Re: [PATCH] Add aliases node to 8641hpcn DTS file.

[Josh Boyer]

On Wed, 05 Dec 2007 12:05:07 -0600
Jon Loeliger <jdl@freescale.com> wrote:

> On Wed, 2007-12-05 at 11:38, Grant Likely wrote:
> 
> > >
> > > +       aliases {
> > > +               ethernet0 = &enet0;
> > > +               ethernet1 = &enet1;
> > > +               ethernet2 = &enet2;
> > > +               ethernet3 = &enet3;
> > > +               serial0 = &serial0;
> > > +               serial1 = &serial1;
> > > +               pci0 = &pci0;
> > > +               pci1 = &pci1;
> > > +       };
> > 
> > I had thought aliases were supposed to be full paths to nodes instead
> > of phandles.  Was I wrong?
> 
> Indeed, that is correct.  And they are!
> 
> => fdt addr c00000
> => fdt print /aliases
> aliases {
>         ethernet0 = "/soc8641@f8000000/ethernet@24000";
>         ethernet1 = "/soc8641@f8000000/ethernet@25000";
>         ethernet2 = "/soc8641@f8000000/ethernet@26000";
>         ethernet3 = "/soc8641@f8000000/ethernet@27000";
>         serial0 = "/soc8641@f8000000/serial@4500";
>         serial1 = "/soc8641@f8000000/serial@4600";
>         pci0 = "/pcie@f8008000";
>         pci1 = "/pcie@f8009000";
> };
> => bootm 1000000 - c00000
> 
> Grant, you need to keep up, man.  Just this morning
> I pushed Gibson's patch to DTC to support this. :-)

So now the in-kernel version of DTC needs to support this.

josh

Re: [PATCH] Add aliases node to 8641hpcn DTS file.

[Mark A. Greer]

On Wed, Dec 05, 2007 at 11:32:50AM -0600, Jon Loeliger wrote:

> diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
> index abb26dc..b039f21 100644
> --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
> +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
> @@ -16,6 +16,17 @@
>  	#address-cells = <1>;
>  	#size-cells = <1>;
>  
> +	aliases {
> +		ethernet0 = &enet0;
> +		ethernet1 = &enet1;
> +		ethernet2 = &enet2;
> +		ethernet3 = &enet3;
> +		serial0 = &serial0;
> +		serial1 = &serial1;
> +		pci0 = &pci0;
> +		pci1 = &pci1;
> +	};
> +
>  	cpus {
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> @@ -107,7 +118,7 @@
>  			};
>  		};
>  
> -		ethernet@24000 {
> +		enet0: ethernet@24000 {
>  			#address-cells = <1>;
>  			#size-cells = <0>;
>  			device_type = "network";

This is probably a dumb question but I'll ask it anyway.

What's the point of 'aliases' when you already have labels?
E.g., why not just use enet0 instead of making an ethernet0 alias?

Mark

Re: [PATCH] Add aliases node to 8641hpcn DTS file.

[David Gibson]

On Wed, Dec 05, 2007 at 03:28:16PM -0700, Mark A. Greer wrote:
> On Wed, Dec 05, 2007 at 11:32:50AM -0600, Jon Loeliger wrote:
> 
> > diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
> > index abb26dc..b039f21 100644
> > --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
> > +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
> > @@ -16,6 +16,17 @@
> >  	#address-cells = <1>;
> >  	#size-cells = <1>;
> >  
> > +	aliases {
> > +		ethernet0 = &enet0;
> > +		ethernet1 = &enet1;
> > +		ethernet2 = &enet2;
> > +		ethernet3 = &enet3;
> > +		serial0 = &serial0;
> > +		serial1 = &serial1;
> > +		pci0 = &pci0;
> > +		pci1 = &pci1;
> > +	};
> > +
> >  	cpus {
> >  		#address-cells = <1>;
> >  		#size-cells = <0>;
> > @@ -107,7 +118,7 @@
> >  			};
> >  		};
> >  
> > -		ethernet@24000 {
> > +		enet0: ethernet@24000 {
> >  			#address-cells = <1>;
> >  			#size-cells = <0>;
> >  			device_type = "network";
> 
> This is probably a dumb question but I'll ask it anyway.
> 
> What's the point of 'aliases' when you already have labels?
> E.g., why not just use enet0 instead of making an ethernet0 alias?

The aliase information is available in the output tree, whereas labels
are only internal to dtc (well, except for asm output).

I'm planning to add support later to automatically generate aliases
from specially marked labels.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson