powerpc/mpc7448: add alias list to DTS, clean out old chosen node
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Thu, 10 Jul 2008 20:21:35 +0000 (16:21 -0400)
committerKumar Gala <galak@kernel.crashing.org>
Wed, 16 Jul 2008 22:57:33 +0000 (17:57 -0500)
The mpc7448hpc2 board doesn't have an alias block like
most of the other modern eval boards have.  We need this
block in order to have u-boot be able to make use of the
CONFIG_OF_STDOUT_VIA_ALIAS (vs. having a hard coded node)
in the future.

Also remove the old, redundant chosen node.  Of all the modern
Freescale eval boards (incl. 83xx, 85xx, 86xx) this is the only
one which still has it.  Its presence also breaks with some older
versions of u-boot, like 1.3.1 -- which try and insert a
second chosen node.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
arch/powerpc/boot/dts/mpc7448hpc2.dts

index 705c23c14f321d8b813d11bae54aa2963491074d..2544f3ecd6e9096fb60d06807176c58ebe83c7a0 100644 (file)
        #address-cells = <1>;
        #size-cells = <1>;
 
        #address-cells = <1>;
        #size-cells = <1>;
 
+       aliases {
+               ethernet0 = &enet0;
+               ethernet1 = &enet1;
+
+               serial0 = &serial0;
+               serial1 = &serial1;
+
+               pci0 = &pci0;
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells =<0>;
        cpus {
                #address-cells = <1>;
                #size-cells =<0>;
@@ -78,7 +88,7 @@
 
                };
 
 
                };
 
-               ethernet@6200 {
+               enet0: ethernet@6200 {
                        linux,network-index = <0>;
                        #size-cells = <0>;
                        device_type = "network";
                        linux,network-index = <0>;
                        #size-cells = <0>;
                        device_type = "network";
                        phy-handle = <&phy8>;
                };
 
                        phy-handle = <&phy8>;
                };
 
-               ethernet@6600 {
+               enet1: ethernet@6600 {
                        linux,network-index = <1>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        linux,network-index = <1>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        phy-handle = <&phy9>;
                };
 
                        phy-handle = <&phy9>;
                };
 
-               serial@7808 {
+               serial0: serial@7808 {
                        device_type = "serial";
                        compatible = "ns16550";
                        reg = <0x7808 0x200>;
                        device_type = "serial";
                        compatible = "ns16550";
                        reg = <0x7808 0x200>;
                        interrupt-parent = <&mpic>;
                };
 
                        interrupt-parent = <&mpic>;
                };
 
-               serial@7c08 {
+               serial1: serial@7c08 {
                        device_type = "serial";
                        compatible = "ns16550";
                        reg = <0x7c08 0x200>;
                        device_type = "serial";
                        compatible = "ns16550";
                        reg = <0x7c08 0x200>;
                        compatible = "chrp,open-pic";
                        device_type = "open-pic";
                };
                        compatible = "chrp,open-pic";
                        device_type = "open-pic";
                };
-               pci@1000 {
+               pci0: pci@1000 {
                        compatible = "tsi108-pci";
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        compatible = "tsi108-pci";
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        };
                };
        };
                        };
                };
        };
-       chosen {
-               linux,stdout-path = "/tsi108@c0000000/serial@7808";
-       };
-
 };
 };