Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc/mpc7448: add alias list to DTS, clean out old chosen node

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>

authored by

Paul Gortmaker and committed by
Kumar Gala
36aa7965 57436612

+15 -9
+15 -9
arch/powerpc/boot/dts/mpc7448hpc2.dts
··· 18 18 #address-cells = <1>; 19 19 #size-cells = <1>; 20 20 21 + aliases { 22 + ethernet0 = &enet0; 23 + ethernet1 = &enet1; 24 + 25 + serial0 = &serial0; 26 + serial1 = &serial1; 27 + 28 + pci0 = &pci0; 29 + }; 30 + 21 31 cpus { 22 32 #address-cells = <1>; 23 33 #size-cells =<0>; ··· 88 78 89 79 }; 90 80 91 - ethernet@6200 { 81 + enet0: ethernet@6200 { 92 82 linux,network-index = <0>; 93 83 #size-cells = <0>; 94 84 device_type = "network"; ··· 101 91 phy-handle = <&phy8>; 102 92 }; 103 93 104 - ethernet@6600 { 94 + enet1: ethernet@6600 { 105 95 linux,network-index = <1>; 106 96 #address-cells = <1>; 107 97 #size-cells = <0>; ··· 115 105 phy-handle = <&phy9>; 116 106 }; 117 107 118 - serial@7808 { 108 + serial0: serial@7808 { 119 109 device_type = "serial"; 120 110 compatible = "ns16550"; 121 111 reg = <0x7808 0x200>; ··· 124 114 interrupt-parent = <&mpic>; 125 115 }; 126 116 127 - serial@7c08 { 117 + serial1: serial@7c08 { 128 118 device_type = "serial"; 129 119 compatible = "ns16550"; 130 120 reg = <0x7c08 0x200>; ··· 141 131 compatible = "chrp,open-pic"; 142 132 device_type = "open-pic"; 143 133 }; 144 - pci@1000 { 134 + pci0: pci@1000 { 145 135 compatible = "tsi108-pci"; 146 136 device_type = "pci"; 147 137 #interrupt-cells = <1>; ··· 194 184 }; 195 185 }; 196 186 }; 197 - chosen { 198 - linux,stdout-path = "/tsi108@c0000000/serial@7808"; 199 - }; 200 - 201 187 };