diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2007-12-12 02:46:12 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-12-12 02:51:03 -0500 |
commit | ea082fa94eab6c2d8ad81c8a46b680cf4c2a3bb3 (patch) | |
tree | eb2972880d4407d7e5bf5a1b58a2e0e54ddbcd32 /arch/powerpc/boot | |
parent | e77b28eb199a8d637a00128b86baf515d4eba5fd (diff) |
[POWERPC] FSL: Added aliases node to device trees
Added aliases nodes for kurobox, 83xx, 85xx, and 86xx platforms.
This included added labels and cell-index properties for serial and
pci nodes.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r-- | arch/powerpc/boot/dts/kuroboxHD.dts | 14 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/kuroboxHG.dts | 14 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8313erdb.dts | 17 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc832x_mds.dts | 17 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc832x_rdb.dts | 17 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8349emitx.dts | 21 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8349emitxgp.dts | 16 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc834x_mds.dts | 21 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc836x_mds.dts | 17 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8540ads.dts | 18 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8541cds.dts | 23 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8544ds.dts | 30 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8548cds.dts | 29 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8555cds.dts | 23 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8560ads.dts | 17 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8568mds.dts | 23 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8572ds.dts | 27 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8610_hpcd.dts | 20 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8641_hpcn.dts | 4 |
19 files changed, 297 insertions, 71 deletions
diff --git a/arch/powerpc/boot/dts/kuroboxHD.dts b/arch/powerpc/boot/dts/kuroboxHD.dts index 1c14dcde6838..446958854519 100644 --- a/arch/powerpc/boot/dts/kuroboxHD.dts +++ b/arch/powerpc/boot/dts/kuroboxHD.dts | |||
@@ -23,6 +23,12 @@ XXXX add flash parts, rtc, ?? | |||
23 | #address-cells = <1>; | 23 | #address-cells = <1>; |
24 | #size-cells = <1>; | 24 | #size-cells = <1>; |
25 | 25 | ||
26 | aliases { | ||
27 | serial0 = &serial0; | ||
28 | serial1 = &serial1; | ||
29 | pci0 = &pci0; | ||
30 | }; | ||
31 | |||
26 | cpus { | 32 | cpus { |
27 | #address-cells = <1>; | 33 | #address-cells = <1>; |
28 | #size-cells = <0>; | 34 | #size-cells = <0>; |
@@ -73,7 +79,8 @@ XXXX add flash parts, rtc, ?? | |||
73 | }; | 79 | }; |
74 | }; | 80 | }; |
75 | 81 | ||
76 | serial@80004500 { | 82 | serial0: serial@80004500 { |
83 | cell-index = <0>; | ||
77 | device_type = "serial"; | 84 | device_type = "serial"; |
78 | compatible = "ns16550"; | 85 | compatible = "ns16550"; |
79 | reg = <80004500 8>; | 86 | reg = <80004500 8>; |
@@ -83,7 +90,8 @@ XXXX add flash parts, rtc, ?? | |||
83 | interrupt-parent = <&mpic>; | 90 | interrupt-parent = <&mpic>; |
84 | }; | 91 | }; |
85 | 92 | ||
86 | serial@80004600 { | 93 | serial1: serial@80004600 { |
94 | cell-index = <1>; | ||
87 | device_type = "serial"; | 95 | device_type = "serial"; |
88 | compatible = "ns16550"; | 96 | compatible = "ns16550"; |
89 | reg = <80004600 8>; | 97 | reg = <80004600 8>; |
@@ -102,7 +110,7 @@ XXXX add flash parts, rtc, ?? | |||
102 | reg = <80040000 40000>; | 110 | reg = <80040000 40000>; |
103 | }; | 111 | }; |
104 | 112 | ||
105 | pci@fec00000 { | 113 | pci0: pci@fec00000 { |
106 | #address-cells = <3>; | 114 | #address-cells = <3>; |
107 | #size-cells = <2>; | 115 | #size-cells = <2>; |
108 | #interrupt-cells = <1>; | 116 | #interrupt-cells = <1>; |
diff --git a/arch/powerpc/boot/dts/kuroboxHG.dts b/arch/powerpc/boot/dts/kuroboxHG.dts index 1b973fa34605..8443c85b7b30 100644 --- a/arch/powerpc/boot/dts/kuroboxHG.dts +++ b/arch/powerpc/boot/dts/kuroboxHG.dts | |||
@@ -23,6 +23,12 @@ XXXX add flash parts, rtc, ?? | |||
23 | #address-cells = <1>; | 23 | #address-cells = <1>; |
24 | #size-cells = <1>; | 24 | #size-cells = <1>; |
25 | 25 | ||
26 | aliases { | ||
27 | serial0 = &serial0; | ||
28 | serial1 = &serial1; | ||
29 | pci0 = &pci0; | ||
30 | }; | ||
31 | |||
26 | cpus { | 32 | cpus { |
27 | #address-cells = <1>; | 33 | #address-cells = <1>; |
28 | #size-cells = <0>; | 34 | #size-cells = <0>; |
@@ -73,7 +79,8 @@ XXXX add flash parts, rtc, ?? | |||
73 | }; | 79 | }; |
74 | }; | 80 | }; |
75 | 81 | ||
76 | serial@80004500 { | 82 | serial0: serial@80004500 { |
83 | cell-index = <0>; | ||
77 | device_type = "serial"; | 84 | device_type = "serial"; |
78 | compatible = "ns16550"; | 85 | compatible = "ns16550"; |
79 | reg = <80004500 8>; | 86 | reg = <80004500 8>; |
@@ -83,7 +90,8 @@ XXXX add flash parts, rtc, ?? | |||
83 | interrupt-parent = <&mpic>; | 90 | interrupt-parent = <&mpic>; |
84 | }; | 91 | }; |
85 | 92 | ||
86 | serial@80004600 { | 93 | serial1: serial@80004600 { |
94 | cell-index = <1>; | ||
87 | device_type = "serial"; | 95 | device_type = "serial"; |
88 | compatible = "ns16550"; | 96 | compatible = "ns16550"; |
89 | reg = <80004600 8>; | 97 | reg = <80004600 8>; |
@@ -102,7 +110,7 @@ XXXX add flash parts, rtc, ?? | |||
102 | reg = <80040000 40000>; | 110 | reg = <80040000 40000>; |
103 | }; | 111 | }; |
104 | 112 | ||
105 | pci@fec00000 { | 113 | pci0: pci@fec00000 { |
106 | #address-cells = <3>; | 114 | #address-cells = <3>; |
107 | #size-cells = <2>; | 115 | #size-cells = <2>; |
108 | #interrupt-cells = <1>; | 116 | #interrupt-cells = <1>; |
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts index 2f8305055270..c5b6665a8209 100644 --- a/arch/powerpc/boot/dts/mpc8313erdb.dts +++ b/arch/powerpc/boot/dts/mpc8313erdb.dts | |||
@@ -15,6 +15,14 @@ | |||
15 | #address-cells = <1>; | 15 | #address-cells = <1>; |
16 | #size-cells = <1>; | 16 | #size-cells = <1>; |
17 | 17 | ||
18 | aliases { | ||
19 | ethernet0 = &enet0; | ||
20 | ethernet1 = &enet1; | ||
21 | serial0 = &serial0; | ||
22 | serial1 = &serial1; | ||
23 | pci0 = &pci0; | ||
24 | }; | ||
25 | |||
18 | cpus { | 26 | cpus { |
19 | #address-cells = <1>; | 27 | #address-cells = <1>; |
20 | #size-cells = <0>; | 28 | #size-cells = <0>; |
@@ -137,7 +145,8 @@ | |||
137 | phy-handle = < &phy4 >; | 145 | phy-handle = < &phy4 >; |
138 | }; | 146 | }; |
139 | 147 | ||
140 | serial@4500 { | 148 | serial0: serial@4500 { |
149 | cell-index = <0>; | ||
141 | device_type = "serial"; | 150 | device_type = "serial"; |
142 | compatible = "ns16550"; | 151 | compatible = "ns16550"; |
143 | reg = <4500 100>; | 152 | reg = <4500 100>; |
@@ -146,7 +155,8 @@ | |||
146 | interrupt-parent = < &ipic >; | 155 | interrupt-parent = < &ipic >; |
147 | }; | 156 | }; |
148 | 157 | ||
149 | serial@4600 { | 158 | serial1: serial@4600 { |
159 | cell-index = <1>; | ||
150 | device_type = "serial"; | 160 | device_type = "serial"; |
151 | compatible = "ns16550"; | 161 | compatible = "ns16550"; |
152 | reg = <4600 100>; | 162 | reg = <4600 100>; |
@@ -184,7 +194,8 @@ | |||
184 | }; | 194 | }; |
185 | }; | 195 | }; |
186 | 196 | ||
187 | pci@e0008500 { | 197 | pci0: pci@e0008500 { |
198 | cell-index = <1>; | ||
188 | interrupt-map-mask = <f800 0 0 7>; | 199 | interrupt-map-mask = <f800 0 0 7>; |
189 | interrupt-map = < | 200 | interrupt-map = < |
190 | 201 | ||
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts index b0d89d6aa5ac..5a88187fe6be 100644 --- a/arch/powerpc/boot/dts/mpc832x_mds.dts +++ b/arch/powerpc/boot/dts/mpc832x_mds.dts | |||
@@ -15,6 +15,14 @@ | |||
15 | #address-cells = <1>; | 15 | #address-cells = <1>; |
16 | #size-cells = <1>; | 16 | #size-cells = <1>; |
17 | 17 | ||
18 | aliases { | ||
19 | ethernet0 = &enet0; | ||
20 | ethernet1 = &enet1; | ||
21 | serial0 = &serial0; | ||
22 | serial1 = &serial1; | ||
23 | pci0 = &pci0; | ||
24 | }; | ||
25 | |||
18 | cpus { | 26 | cpus { |
19 | #address-cells = <1>; | 27 | #address-cells = <1>; |
20 | #size-cells = <0>; | 28 | #size-cells = <0>; |
@@ -72,7 +80,8 @@ | |||
72 | }; | 80 | }; |
73 | }; | 81 | }; |
74 | 82 | ||
75 | serial@4500 { | 83 | serial0: serial@4500 { |
84 | cell-index = <0>; | ||
76 | device_type = "serial"; | 85 | device_type = "serial"; |
77 | compatible = "ns16550"; | 86 | compatible = "ns16550"; |
78 | reg = <4500 100>; | 87 | reg = <4500 100>; |
@@ -81,7 +90,8 @@ | |||
81 | interrupt-parent = < &ipic >; | 90 | interrupt-parent = < &ipic >; |
82 | }; | 91 | }; |
83 | 92 | ||
84 | serial@4600 { | 93 | serial1: serial@4600 { |
94 | cell-index = <1>; | ||
85 | device_type = "serial"; | 95 | device_type = "serial"; |
86 | compatible = "ns16550"; | 96 | compatible = "ns16550"; |
87 | reg = <4600 100>; | 97 | reg = <4600 100>; |
@@ -273,7 +283,8 @@ | |||
273 | }; | 283 | }; |
274 | }; | 284 | }; |
275 | 285 | ||
276 | pci@e0008500 { | 286 | pci0: pci@e0008500 { |
287 | cell-index = <1>; | ||
277 | interrupt-map-mask = <f800 0 0 7>; | 288 | interrupt-map-mask = <f800 0 0 7>; |
278 | interrupt-map = < | 289 | interrupt-map = < |
279 | /* IDSEL 0x11 AD17 */ | 290 | /* IDSEL 0x11 AD17 */ |
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts index 0c64381b61de..d31498628307 100644 --- a/arch/powerpc/boot/dts/mpc832x_rdb.dts +++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts | |||
@@ -15,6 +15,14 @@ | |||
15 | #address-cells = <1>; | 15 | #address-cells = <1>; |
16 | #size-cells = <1>; | 16 | #size-cells = <1>; |
17 | 17 | ||
18 | aliases { | ||
19 | ethernet0 = &enet0; | ||
20 | ethernet1 = &enet1; | ||
21 | serial0 = &serial0; | ||
22 | serial1 = &serial1; | ||
23 | pci0 = &pci0; | ||
24 | }; | ||
25 | |||
18 | cpus { | 26 | cpus { |
19 | #address-cells = <1>; | 27 | #address-cells = <1>; |
20 | #size-cells = <0>; | 28 | #size-cells = <0>; |
@@ -62,7 +70,8 @@ | |||
62 | dfsrr; | 70 | dfsrr; |
63 | }; | 71 | }; |
64 | 72 | ||
65 | serial@4500 { | 73 | serial0: serial@4500 { |
74 | cell-index = <0>; | ||
66 | device_type = "serial"; | 75 | device_type = "serial"; |
67 | compatible = "ns16550"; | 76 | compatible = "ns16550"; |
68 | reg = <4500 100>; | 77 | reg = <4500 100>; |
@@ -71,7 +80,8 @@ | |||
71 | interrupt-parent = <&pic>; | 80 | interrupt-parent = <&pic>; |
72 | }; | 81 | }; |
73 | 82 | ||
74 | serial@4600 { | 83 | serial1: serial@4600 { |
84 | cell-index = <1>; | ||
75 | device_type = "serial"; | 85 | device_type = "serial"; |
76 | compatible = "ns16550"; | 86 | compatible = "ns16550"; |
77 | reg = <4600 100>; | 87 | reg = <4600 100>; |
@@ -254,7 +264,8 @@ | |||
254 | }; | 264 | }; |
255 | }; | 265 | }; |
256 | 266 | ||
257 | pci@e0008500 { | 267 | pci0: pci@e0008500 { |
268 | cell-index = <1>; | ||
258 | interrupt-map-mask = <f800 0 0 7>; | 269 | interrupt-map-mask = <f800 0 0 7>; |
259 | interrupt-map = < | 270 | interrupt-map = < |
260 | /* IDSEL 0x10 AD16 (USB) */ | 271 | /* IDSEL 0x10 AD16 (USB) */ |
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts index d2184ada16d8..e354f2634246 100644 --- a/arch/powerpc/boot/dts/mpc8349emitx.dts +++ b/arch/powerpc/boot/dts/mpc8349emitx.dts | |||
@@ -14,6 +14,15 @@ | |||
14 | #address-cells = <1>; | 14 | #address-cells = <1>; |
15 | #size-cells = <1>; | 15 | #size-cells = <1>; |
16 | 16 | ||
17 | aliases { | ||
18 | ethernet0 = &enet0; | ||
19 | ethernet1 = &enet1; | ||
20 | serial0 = &serial0; | ||
21 | serial1 = &serial1; | ||
22 | pci0 = &pci0; | ||
23 | pci1 = &pci1; | ||
24 | }; | ||
25 | |||
17 | cpus { | 26 | cpus { |
18 | #address-cells = <1>; | 27 | #address-cells = <1>; |
19 | #size-cells = <0>; | 28 | #size-cells = <0>; |
@@ -154,7 +163,8 @@ | |||
154 | linux,network-index = <1>; | 163 | linux,network-index = <1>; |
155 | }; | 164 | }; |
156 | 165 | ||
157 | serial@4500 { | 166 | serial0: serial@4500 { |
167 | cell-index = <0>; | ||
158 | device_type = "serial"; | 168 | device_type = "serial"; |
159 | compatible = "ns16550"; | 169 | compatible = "ns16550"; |
160 | reg = <4500 100>; | 170 | reg = <4500 100>; |
@@ -163,7 +173,8 @@ | |||
163 | interrupt-parent = < &ipic >; | 173 | interrupt-parent = < &ipic >; |
164 | }; | 174 | }; |
165 | 175 | ||
166 | serial@4600 { | 176 | serial1: serial@4600 { |
177 | cell-index = <1>; | ||
167 | device_type = "serial"; | 178 | device_type = "serial"; |
168 | compatible = "ns16550"; | 179 | compatible = "ns16550"; |
169 | reg = <4600 100>; | 180 | reg = <4600 100>; |
@@ -194,7 +205,8 @@ | |||
194 | }; | 205 | }; |
195 | }; | 206 | }; |
196 | 207 | ||
197 | pci@e0008500 { | 208 | pci0: pci@e0008500 { |
209 | cell-index = <1>; | ||
198 | interrupt-map-mask = <f800 0 0 7>; | 210 | interrupt-map-mask = <f800 0 0 7>; |
199 | interrupt-map = < | 211 | interrupt-map = < |
200 | /* IDSEL 0x10 - SATA */ | 212 | /* IDSEL 0x10 - SATA */ |
@@ -215,7 +227,8 @@ | |||
215 | device_type = "pci"; | 227 | device_type = "pci"; |
216 | }; | 228 | }; |
217 | 229 | ||
218 | pci@e0008600 { | 230 | pci1: pci@e0008600 { |
231 | cell-index = <2>; | ||
219 | interrupt-map-mask = <f800 0 0 7>; | 232 | interrupt-map-mask = <f800 0 0 7>; |
220 | interrupt-map = < | 233 | interrupt-map = < |
221 | /* IDSEL 0x0E - MiniPCI Slot */ | 234 | /* IDSEL 0x0E - MiniPCI Slot */ |
diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts index 30c68160d1b4..ebdf0b750086 100644 --- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts +++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts | |||
@@ -14,6 +14,13 @@ | |||
14 | #address-cells = <1>; | 14 | #address-cells = <1>; |
15 | #size-cells = <1>; | 15 | #size-cells = <1>; |
16 | 16 | ||
17 | aliases { | ||
18 | ethernet0 = &enet0; | ||
19 | serial0 = &serial0; | ||
20 | serial1 = &serial1; | ||
21 | pci0 = &pci0; | ||
22 | }; | ||
23 | |||
17 | cpus { | 24 | cpus { |
18 | #address-cells = <1>; | 25 | #address-cells = <1>; |
19 | #size-cells = <0>; | 26 | #size-cells = <0>; |
@@ -121,7 +128,8 @@ | |||
121 | linux,network-index = <0>; | 128 | linux,network-index = <0>; |
122 | }; | 129 | }; |
123 | 130 | ||
124 | serial@4500 { | 131 | serial0: serial@4500 { |
132 | cell-index = <0>; | ||
125 | device_type = "serial"; | 133 | device_type = "serial"; |
126 | compatible = "ns16550"; | 134 | compatible = "ns16550"; |
127 | reg = <4500 100>; | 135 | reg = <4500 100>; |
@@ -130,7 +138,8 @@ | |||
130 | interrupt-parent = < &ipic >; | 138 | interrupt-parent = < &ipic >; |
131 | }; | 139 | }; |
132 | 140 | ||
133 | serial@4600 { | 141 | serial1: serial@4600 { |
142 | cell-index = <1>; | ||
134 | device_type = "serial"; | 143 | device_type = "serial"; |
135 | compatible = "ns16550"; | 144 | compatible = "ns16550"; |
136 | reg = <4600 100>; | 145 | reg = <4600 100>; |
@@ -161,7 +170,8 @@ | |||
161 | }; | 170 | }; |
162 | }; | 171 | }; |
163 | 172 | ||
164 | pci@e0008600 { | 173 | pci0: pci@e0008600 { |
174 | cell-index = <2>; | ||
165 | interrupt-map-mask = <f800 0 0 7>; | 175 | interrupt-map-mask = <f800 0 0 7>; |
166 | interrupt-map = < | 176 | interrupt-map = < |
167 | /* IDSEL 0x0F - PCI Slot */ | 177 | /* IDSEL 0x0F - PCI Slot */ |
diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts index c5239c9f2759..0ba13ebcea68 100644 --- a/arch/powerpc/boot/dts/mpc834x_mds.dts +++ b/arch/powerpc/boot/dts/mpc834x_mds.dts | |||
@@ -15,6 +15,15 @@ | |||
15 | #address-cells = <1>; | 15 | #address-cells = <1>; |
16 | #size-cells = <1>; | 16 | #size-cells = <1>; |
17 | 17 | ||
18 | aliases { | ||
19 | ethernet0 = &enet0; | ||
20 | ethernet1 = &enet1; | ||
21 | serial0 = &serial0; | ||
22 | serial1 = &serial1; | ||
23 | pci0 = &pci0; | ||
24 | pci1 = &pci1; | ||
25 | }; | ||
26 | |||
18 | cpus { | 27 | cpus { |
19 | #address-cells = <1>; | 28 | #address-cells = <1>; |
20 | #size-cells = <0>; | 29 | #size-cells = <0>; |
@@ -164,7 +173,8 @@ | |||
164 | linux,network-index = <1>; | 173 | linux,network-index = <1>; |
165 | }; | 174 | }; |
166 | 175 | ||
167 | serial@4500 { | 176 | serial0: serial@4500 { |
177 | cell-index = <0>; | ||
168 | device_type = "serial"; | 178 | device_type = "serial"; |
169 | compatible = "ns16550"; | 179 | compatible = "ns16550"; |
170 | reg = <4500 100>; | 180 | reg = <4500 100>; |
@@ -173,7 +183,8 @@ | |||
173 | interrupt-parent = < &ipic >; | 183 | interrupt-parent = < &ipic >; |
174 | }; | 184 | }; |
175 | 185 | ||
176 | serial@4600 { | 186 | serial1: serial@4600 { |
187 | cell-index = <1>; | ||
177 | device_type = "serial"; | 188 | device_type = "serial"; |
178 | compatible = "ns16550"; | 189 | compatible = "ns16550"; |
179 | reg = <4600 100>; | 190 | reg = <4600 100>; |
@@ -213,7 +224,8 @@ | |||
213 | }; | 224 | }; |
214 | }; | 225 | }; |
215 | 226 | ||
216 | pci@e0008500 { | 227 | pci0: pci@e0008500 { |
228 | cell-index = <1>; | ||
217 | interrupt-map-mask = <f800 0 0 7>; | 229 | interrupt-map-mask = <f800 0 0 7>; |
218 | interrupt-map = < | 230 | interrupt-map = < |
219 | 231 | ||
@@ -273,7 +285,8 @@ | |||
273 | device_type = "pci"; | 285 | device_type = "pci"; |
274 | }; | 286 | }; |
275 | 287 | ||
276 | pci@e0008600 { | 288 | pci1: pci@e0008600 { |
289 | cell-index = <2>; | ||
277 | interrupt-map-mask = <f800 0 0 7>; | 290 | interrupt-map-mask = <f800 0 0 7>; |
278 | interrupt-map = < | 291 | interrupt-map = < |
279 | 292 | ||
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts index 3b0873a8c909..ea07a6f03332 100644 --- a/arch/powerpc/boot/dts/mpc836x_mds.dts +++ b/arch/powerpc/boot/dts/mpc836x_mds.dts | |||
@@ -20,6 +20,14 @@ | |||
20 | #address-cells = <1>; | 20 | #address-cells = <1>; |
21 | #size-cells = <1>; | 21 | #size-cells = <1>; |
22 | 22 | ||
23 | aliases { | ||
24 | ethernet0 = &enet0; | ||
25 | ethernet1 = &enet1; | ||
26 | serial0 = &serial0; | ||
27 | serial1 = &serial1; | ||
28 | pci0 = &pci0; | ||
29 | }; | ||
30 | |||
23 | cpus { | 31 | cpus { |
24 | #address-cells = <1>; | 32 | #address-cells = <1>; |
25 | #size-cells = <0>; | 33 | #size-cells = <0>; |
@@ -88,7 +96,8 @@ | |||
88 | dfsrr; | 96 | dfsrr; |
89 | }; | 97 | }; |
90 | 98 | ||
91 | serial@4500 { | 99 | serial0: serial@4500 { |
100 | cell-index = <0>; | ||
92 | device_type = "serial"; | 101 | device_type = "serial"; |
93 | compatible = "ns16550"; | 102 | compatible = "ns16550"; |
94 | reg = <4500 100>; | 103 | reg = <4500 100>; |
@@ -97,7 +106,8 @@ | |||
97 | interrupt-parent = < &ipic >; | 106 | interrupt-parent = < &ipic >; |
98 | }; | 107 | }; |
99 | 108 | ||
100 | serial@4600 { | 109 | serial1: serial@4600 { |
110 | cell-index = <1>; | ||
101 | device_type = "serial"; | 111 | device_type = "serial"; |
102 | compatible = "ns16550"; | 112 | compatible = "ns16550"; |
103 | reg = <4600 100>; | 113 | reg = <4600 100>; |
@@ -306,7 +316,8 @@ | |||
306 | }; | 316 | }; |
307 | }; | 317 | }; |
308 | 318 | ||
309 | pci@e0008500 { | 319 | pci0: pci@e0008500 { |
320 | cell-index = <1>; | ||
310 | interrupt-map-mask = <f800 0 0 7>; | 321 | interrupt-map-mask = <f800 0 0 7>; |
311 | interrupt-map = < | 322 | interrupt-map = < |
312 | 323 | ||
diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts index 7961d911a008..975248491b7b 100644 --- a/arch/powerpc/boot/dts/mpc8540ads.dts +++ b/arch/powerpc/boot/dts/mpc8540ads.dts | |||
@@ -16,6 +16,15 @@ | |||
16 | #address-cells = <1>; | 16 | #address-cells = <1>; |
17 | #size-cells = <1>; | 17 | #size-cells = <1>; |
18 | 18 | ||
19 | aliases { | ||
20 | ethernet0 = &enet0; | ||
21 | ethernet1 = &enet1; | ||
22 | ethernet2 = &enet2; | ||
23 | serial0 = &serial0; | ||
24 | serial1 = &serial1; | ||
25 | pci0 = &pci0; | ||
26 | }; | ||
27 | |||
19 | cpus { | 28 | cpus { |
20 | #address-cells = <1>; | 29 | #address-cells = <1>; |
21 | #size-cells = <0>; | 30 | #size-cells = <0>; |
@@ -135,7 +144,8 @@ | |||
135 | phy-handle = <&phy3>; | 144 | phy-handle = <&phy3>; |
136 | }; | 145 | }; |
137 | 146 | ||
138 | serial@4500 { | 147 | serial0: serial@4500 { |
148 | cell-index = <0>; | ||
139 | device_type = "serial"; | 149 | device_type = "serial"; |
140 | compatible = "ns16550"; | 150 | compatible = "ns16550"; |
141 | reg = <4500 100>; // reg base, size | 151 | reg = <4500 100>; // reg base, size |
@@ -144,7 +154,8 @@ | |||
144 | interrupt-parent = <&mpic>; | 154 | interrupt-parent = <&mpic>; |
145 | }; | 155 | }; |
146 | 156 | ||
147 | serial@4600 { | 157 | serial1: serial@4600 { |
158 | cell-index = <1>; | ||
148 | device_type = "serial"; | 159 | device_type = "serial"; |
149 | compatible = "ns16550"; | 160 | compatible = "ns16550"; |
150 | reg = <4600 100>; // reg base, size | 161 | reg = <4600 100>; // reg base, size |
@@ -164,7 +175,8 @@ | |||
164 | }; | 175 | }; |
165 | }; | 176 | }; |
166 | 177 | ||
167 | pci@e0008000 { | 178 | pci0: pci@e0008000 { |
179 | cell-index = <0>; | ||
168 | interrupt-map-mask = <f800 0 0 7>; | 180 | interrupt-map-mask = <f800 0 0 7>; |
169 | interrupt-map = < | 181 | interrupt-map = < |
170 | 182 | ||
diff --git a/arch/powerpc/boot/dts/mpc8541cds.dts b/arch/powerpc/boot/dts/mpc8541cds.dts index 8637fe09d952..fa8d9aaad157 100644 --- a/arch/powerpc/boot/dts/mpc8541cds.dts +++ b/arch/powerpc/boot/dts/mpc8541cds.dts | |||
@@ -16,6 +16,15 @@ | |||
16 | #address-cells = <1>; | 16 | #address-cells = <1>; |
17 | #size-cells = <1>; | 17 | #size-cells = <1>; |
18 | 18 | ||
19 | aliases { | ||
20 | ethernet0 = &enet0; | ||
21 | ethernet1 = &enet1; | ||
22 | serial0 = &serial0; | ||
23 | serial1 = &serial1; | ||
24 | pci0 = &pci0; | ||
25 | pci1 = &pci1; | ||
26 | }; | ||
27 | |||
19 | cpus { | 28 | cpus { |
20 | #address-cells = <1>; | 29 | #address-cells = <1>; |
21 | #size-cells = <0>; | 30 | #size-cells = <0>; |
@@ -117,7 +126,8 @@ | |||
117 | phy-handle = <&phy1>; | 126 | phy-handle = <&phy1>; |
118 | }; | 127 | }; |
119 | 128 | ||
120 | serial@4500 { | 129 | serial0: serial@4500 { |
130 | cell-index = <0>; | ||
121 | device_type = "serial"; | 131 | device_type = "serial"; |
122 | compatible = "ns16550"; | 132 | compatible = "ns16550"; |
123 | reg = <4500 100>; // reg base, size | 133 | reg = <4500 100>; // reg base, size |
@@ -126,7 +136,8 @@ | |||
126 | interrupt-parent = <&mpic>; | 136 | interrupt-parent = <&mpic>; |
127 | }; | 137 | }; |
128 | 138 | ||
129 | serial@4600 { | 139 | serial1: serial@4600 { |
140 | cell-index = <1>; | ||
130 | device_type = "serial"; | 141 | device_type = "serial"; |
131 | compatible = "ns16550"; | 142 | compatible = "ns16550"; |
132 | reg = <4600 100>; // reg base, size | 143 | reg = <4600 100>; // reg base, size |
@@ -183,7 +194,8 @@ | |||
183 | }; | 194 | }; |
184 | }; | 195 | }; |
185 | 196 | ||
186 | pci1: pci@e0008000 { | 197 | pci0: pci@e0008000 { |
198 | cell-index = <0>; | ||
187 | interrupt-map-mask = <1f800 0 0 7>; | 199 | interrupt-map-mask = <1f800 0 0 7>; |
188 | interrupt-map = < | 200 | interrupt-map = < |
189 | 201 | ||
@@ -250,11 +262,12 @@ | |||
250 | #interrupt-cells = <2>; | 262 | #interrupt-cells = <2>; |
251 | compatible = "chrp,iic"; | 263 | compatible = "chrp,iic"; |
252 | interrupts = <1>; | 264 | interrupts = <1>; |
253 | interrupt-parent = <&pci1>; | 265 | interrupt-parent = <&pci0>; |
254 | }; | 266 | }; |
255 | }; | 267 | }; |
256 | 268 | ||
257 | pci@e0009000 { | 269 | pci1: pci@e0009000 { |
270 | cell-index = <1>; | ||
258 | interrupt-map-mask = <f800 0 0 7>; | 271 | interrupt-map-mask = <f800 0 0 7>; |
259 | interrupt-map = < | 272 | interrupt-map = < |
260 | 273 | ||
diff --git a/arch/powerpc/boot/dts/mpc8544ds.dts b/arch/powerpc/boot/dts/mpc8544ds.dts index a98c46e00f80..54b3bdf7fc97 100644 --- a/arch/powerpc/boot/dts/mpc8544ds.dts +++ b/arch/powerpc/boot/dts/mpc8544ds.dts | |||
@@ -15,6 +15,17 @@ | |||
15 | #address-cells = <1>; | 15 | #address-cells = <1>; |
16 | #size-cells = <1>; | 16 | #size-cells = <1>; |
17 | 17 | ||
18 | aliases { | ||
19 | ethernet0 = &enet0; | ||
20 | ethernet1 = &enet1; | ||
21 | serial0 = &serial0; | ||
22 | serial1 = &serial1; | ||
23 | pci0 = &pci0; | ||
24 | pci1 = &pci1; | ||
25 | pci2 = &pci2; | ||
26 | pci3 = &pci3; | ||
27 | }; | ||
28 | |||
18 | cpus { | 29 | cpus { |
19 | #cpus = <1>; | 30 | #cpus = <1>; |
20 | #address-cells = <1>; | 31 | #address-cells = <1>; |
@@ -131,7 +142,8 @@ | |||
131 | phy-connection-type = "rgmii-id"; | 142 | phy-connection-type = "rgmii-id"; |
132 | }; | 143 | }; |
133 | 144 | ||
134 | serial@4500 { | 145 | serial0: serial@4500 { |
146 | cell-index = <0>; | ||
135 | device_type = "serial"; | 147 | device_type = "serial"; |
136 | compatible = "ns16550"; | 148 | compatible = "ns16550"; |
137 | reg = <4500 100>; | 149 | reg = <4500 100>; |
@@ -140,7 +152,8 @@ | |||
140 | interrupt-parent = <&mpic>; | 152 | interrupt-parent = <&mpic>; |
141 | }; | 153 | }; |
142 | 154 | ||
143 | serial@4600 { | 155 | serial1: serial@4600 { |
156 | cell-index = <1>; | ||
144 | device_type = "serial"; | 157 | device_type = "serial"; |
145 | compatible = "ns16550"; | 158 | compatible = "ns16550"; |
146 | reg = <4600 100>; | 159 | reg = <4600 100>; |
@@ -167,7 +180,8 @@ | |||
167 | }; | 180 | }; |
168 | }; | 181 | }; |
169 | 182 | ||
170 | pci@e0008000 { | 183 | pci0: pci@e0008000 { |
184 | cell-index = <0>; | ||
171 | compatible = "fsl,mpc8540-pci"; | 185 | compatible = "fsl,mpc8540-pci"; |
172 | device_type = "pci"; | 186 | device_type = "pci"; |
173 | interrupt-map-mask = <f800 0 0 7>; | 187 | interrupt-map-mask = <f800 0 0 7>; |
@@ -198,7 +212,8 @@ | |||
198 | reg = <e0008000 1000>; | 212 | reg = <e0008000 1000>; |
199 | }; | 213 | }; |
200 | 214 | ||
201 | pcie@e0009000 { | 215 | pci1: pcie@e0009000 { |
216 | cell-index = <1>; | ||
202 | compatible = "fsl,mpc8548-pcie"; | 217 | compatible = "fsl,mpc8548-pcie"; |
203 | device_type = "pci"; | 218 | device_type = "pci"; |
204 | #interrupt-cells = <1>; | 219 | #interrupt-cells = <1>; |
@@ -234,7 +249,8 @@ | |||
234 | }; | 249 | }; |
235 | }; | 250 | }; |
236 | 251 | ||
237 | pcie@e000a000 { | 252 | pci2: pcie@e000a000 { |
253 | cell-index = <2>; | ||
238 | compatible = "fsl,mpc8548-pcie"; | 254 | compatible = "fsl,mpc8548-pcie"; |
239 | device_type = "pci"; | 255 | device_type = "pci"; |
240 | #interrupt-cells = <1>; | 256 | #interrupt-cells = <1>; |
@@ -270,7 +286,8 @@ | |||
270 | }; | 286 | }; |
271 | }; | 287 | }; |
272 | 288 | ||
273 | pcie@e000b000 { | 289 | pci3: pcie@e000b000 { |
290 | cell-index = <3>; | ||
274 | compatible = "fsl,mpc8548-pcie"; | 291 | compatible = "fsl,mpc8548-pcie"; |
275 | device_type = "pci"; | 292 | device_type = "pci"; |
276 | #interrupt-cells = <1>; | 293 | #interrupt-cells = <1>; |
@@ -380,6 +397,5 @@ | |||
380 | }; | 397 | }; |
381 | }; | 398 | }; |
382 | }; | 399 | }; |
383 | |||
384 | }; | 400 | }; |
385 | }; | 401 | }; |
diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts index 64f83d0fb5aa..1f470c6a1c63 100644 --- a/arch/powerpc/boot/dts/mpc8548cds.dts +++ b/arch/powerpc/boot/dts/mpc8548cds.dts | |||
@@ -16,6 +16,20 @@ | |||
16 | #address-cells = <1>; | 16 | #address-cells = <1>; |
17 | #size-cells = <1>; | 17 | #size-cells = <1>; |
18 | 18 | ||
19 | aliases { | ||
20 | ethernet0 = &enet0; | ||
21 | ethernet1 = &enet1; | ||
22 | /* | ||
23 | ethernet2 = &enet2; | ||
24 | ethernet3 = &enet3; | ||
25 | */ | ||
26 | serial0 = &serial0; | ||
27 | serial1 = &serial1; | ||
28 | pci0 = &pci0; | ||
29 | pci1 = &pci1; | ||
30 | pci2 = &pci2; | ||
31 | }; | ||
32 | |||
19 | cpus { | 33 | cpus { |
20 | #address-cells = <1>; | 34 | #address-cells = <1>; |
21 | #size-cells = <0>; | 35 | #size-cells = <0>; |
@@ -166,7 +180,8 @@ | |||
166 | }; | 180 | }; |
167 | */ | 181 | */ |
168 | 182 | ||
169 | serial@4500 { | 183 | serial0: serial@4500 { |
184 | cell-index = <0>; | ||
170 | device_type = "serial"; | 185 | device_type = "serial"; |
171 | compatible = "ns16550"; | 186 | compatible = "ns16550"; |
172 | reg = <4500 100>; // reg base, size | 187 | reg = <4500 100>; // reg base, size |
@@ -175,7 +190,8 @@ | |||
175 | interrupt-parent = <&mpic>; | 190 | interrupt-parent = <&mpic>; |
176 | }; | 191 | }; |
177 | 192 | ||
178 | serial@4600 { | 193 | serial1: serial@4600 { |
194 | cell-index = <1>; | ||
179 | device_type = "serial"; | 195 | device_type = "serial"; |
180 | compatible = "ns16550"; | 196 | compatible = "ns16550"; |
181 | reg = <4600 100>; // reg base, size | 197 | reg = <4600 100>; // reg base, size |
@@ -202,7 +218,8 @@ | |||
202 | }; | 218 | }; |
203 | }; | 219 | }; |
204 | 220 | ||
205 | pci@e0008000 { | 221 | pci0: pci@e0008000 { |
222 | cell-index = <0>; | ||
206 | interrupt-map-mask = <f800 0 0 7>; | 223 | interrupt-map-mask = <f800 0 0 7>; |
207 | interrupt-map = < | 224 | interrupt-map = < |
208 | /* IDSEL 0x4 (PCIX Slot 2) */ | 225 | /* IDSEL 0x4 (PCIX Slot 2) */ |
@@ -351,7 +368,8 @@ | |||
351 | }; | 368 | }; |
352 | }; | 369 | }; |
353 | 370 | ||
354 | pci@e0009000 { | 371 | pci1: pci@e0009000 { |
372 | cell-index = <1>; | ||
355 | interrupt-map-mask = <f800 0 0 7>; | 373 | interrupt-map-mask = <f800 0 0 7>; |
356 | interrupt-map = < | 374 | interrupt-map = < |
357 | 375 | ||
@@ -375,7 +393,8 @@ | |||
375 | device_type = "pci"; | 393 | device_type = "pci"; |
376 | }; | 394 | }; |
377 | 395 | ||
378 | pcie@e000a000 { | 396 | pci2: pcie@e000a000 { |
397 | cell-index = <2>; | ||
379 | interrupt-map-mask = <f800 0 0 7>; | 398 | interrupt-map-mask = <f800 0 0 7>; |
380 | interrupt-map = < | 399 | interrupt-map = < |
381 | 400 | ||
diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts b/arch/powerpc/boot/dts/mpc8555cds.dts index 339e87345056..4538f3c38862 100644 --- a/arch/powerpc/boot/dts/mpc8555cds.dts +++ b/arch/powerpc/boot/dts/mpc8555cds.dts | |||
@@ -16,6 +16,15 @@ | |||
16 | #address-cells = <1>; | 16 | #address-cells = <1>; |
17 | #size-cells = <1>; | 17 | #size-cells = <1>; |
18 | 18 | ||
19 | aliases { | ||
20 | ethernet0 = &enet0; | ||
21 | ethernet1 = &enet1; | ||
22 | serial0 = &serial0; | ||
23 | serial1 = &serial1; | ||
24 | pci0 = &pci0; | ||
25 | pci1 = &pci1; | ||
26 | }; | ||
27 | |||
19 | cpus { | 28 | cpus { |
20 | #address-cells = <1>; | 29 | #address-cells = <1>; |
21 | #size-cells = <0>; | 30 | #size-cells = <0>; |
@@ -117,7 +126,8 @@ | |||
117 | phy-handle = <&phy1>; | 126 | phy-handle = <&phy1>; |
118 | }; | 127 | }; |
119 | 128 | ||
120 | serial@4500 { | 129 | serial0: serial@4500 { |
130 | cell-index = <0>; | ||
121 | device_type = "serial"; | 131 | device_type = "serial"; |
122 | compatible = "ns16550"; | 132 | compatible = "ns16550"; |
123 | reg = <4500 100>; // reg base, size | 133 | reg = <4500 100>; // reg base, size |
@@ -126,7 +136,8 @@ | |||
126 | interrupt-parent = <&mpic>; | 136 | interrupt-parent = <&mpic>; |
127 | }; | 137 | }; |
128 | 138 | ||
129 | serial@4600 { | 139 | serial1: serial@4600 { |
140 | cell-index = <1>; | ||
130 | device_type = "serial"; | 141 | device_type = "serial"; |
131 | compatible = "ns16550"; | 142 | compatible = "ns16550"; |
132 | reg = <4600 100>; // reg base, size | 143 | reg = <4600 100>; // reg base, size |
@@ -183,7 +194,8 @@ | |||
183 | }; | 194 | }; |
184 | }; | 195 | }; |
185 | 196 | ||
186 | pci1: pci@e0008000 { | 197 | pci0: pci@e0008000 { |
198 | cell-index = <0>; | ||
187 | interrupt-map-mask = <1f800 0 0 7>; | 199 | interrupt-map-mask = <1f800 0 0 7>; |
188 | interrupt-map = < | 200 | interrupt-map = < |
189 | 201 | ||
@@ -250,11 +262,12 @@ | |||
250 | #interrupt-cells = <2>; | 262 | #interrupt-cells = <2>; |
251 | compatible = "chrp,iic"; | 263 | compatible = "chrp,iic"; |
252 | interrupts = <1>; | 264 | interrupts = <1>; |
253 | interrupt-parent = <&pci1>; | 265 | interrupt-parent = <&pci0>; |
254 | }; | 266 | }; |
255 | }; | 267 | }; |
256 | 268 | ||
257 | pci@e0009000 { | 269 | pci1: pci@e0009000 { |
270 | cell-index = <1>; | ||
258 | interrupt-map-mask = <f800 0 0 7>; | 271 | interrupt-map-mask = <f800 0 0 7>; |
259 | interrupt-map = < | 272 | interrupt-map = < |
260 | 273 | ||
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts index 936a4d509990..639ce8a709a6 100644 --- a/arch/powerpc/boot/dts/mpc8560ads.dts +++ b/arch/powerpc/boot/dts/mpc8560ads.dts | |||
@@ -16,6 +16,16 @@ | |||
16 | #address-cells = <1>; | 16 | #address-cells = <1>; |
17 | #size-cells = <1>; | 17 | #size-cells = <1>; |
18 | 18 | ||
19 | aliases { | ||
20 | ethernet0 = &enet0; | ||
21 | ethernet1 = &enet1; | ||
22 | ethernet2 = &enet2; | ||
23 | ethernet3 = &enet3; | ||
24 | serial0 = &serial0; | ||
25 | serial1 = &serial1; | ||
26 | pci0 = &pci0; | ||
27 | }; | ||
28 | |||
19 | cpus { | 29 | cpus { |
20 | #address-cells = <1>; | 30 | #address-cells = <1>; |
21 | #size-cells = <0>; | 31 | #size-cells = <0>; |
@@ -162,7 +172,7 @@ | |||
162 | compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic"; | 172 | compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic"; |
163 | }; | 173 | }; |
164 | 174 | ||
165 | serial@91a00 { | 175 | serial0: serial@91a00 { |
166 | device_type = "serial"; | 176 | device_type = "serial"; |
167 | compatible = "fsl,mpc8560-scc-uart", | 177 | compatible = "fsl,mpc8560-scc-uart", |
168 | "fsl,cpm2-scc-uart"; | 178 | "fsl,cpm2-scc-uart"; |
@@ -174,7 +184,7 @@ | |||
174 | interrupt-parent = <&cpmpic>; | 184 | interrupt-parent = <&cpmpic>; |
175 | }; | 185 | }; |
176 | 186 | ||
177 | serial@91a20 { | 187 | serial1: serial@91a20 { |
178 | device_type = "serial"; | 188 | device_type = "serial"; |
179 | compatible = "fsl,mpc8560-scc-uart", | 189 | compatible = "fsl,mpc8560-scc-uart", |
180 | "fsl,cpm2-scc-uart"; | 190 | "fsl,cpm2-scc-uart"; |
@@ -212,7 +222,8 @@ | |||
212 | }; | 222 | }; |
213 | }; | 223 | }; |
214 | 224 | ||
215 | pci@e0008000 { | 225 | pci0: pci@e0008000 { |
226 | cell-index = <0>; | ||
216 | #interrupt-cells = <1>; | 227 | #interrupt-cells = <1>; |
217 | #size-cells = <2>; | 228 | #size-cells = <2>; |
218 | #address-cells = <3>; | 229 | #address-cells = <3>; |
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts index 60f0eab4ca8d..90545b16130d 100644 --- a/arch/powerpc/boot/dts/mpc8568mds.dts +++ b/arch/powerpc/boot/dts/mpc8568mds.dts | |||
@@ -20,6 +20,17 @@ | |||
20 | #address-cells = <1>; | 20 | #address-cells = <1>; |
21 | #size-cells = <1>; | 21 | #size-cells = <1>; |
22 | 22 | ||
23 | aliases { | ||
24 | ethernet0 = &enet0; | ||
25 | ethernet1 = &enet1; | ||
26 | ethernet2 = &enet2; | ||
27 | ethernet3 = &enet3; | ||
28 | serial0 = &serial0; | ||
29 | serial1 = &serial1; | ||
30 | pci0 = &pci0; | ||
31 | pci1 = &pci1; | ||
32 | }; | ||
33 | |||
23 | cpus { | 34 | cpus { |
24 | #address-cells = <1>; | 35 | #address-cells = <1>; |
25 | #size-cells = <0>; | 36 | #size-cells = <0>; |
@@ -154,7 +165,8 @@ | |||
154 | phy-handle = <&phy3>; | 165 | phy-handle = <&phy3>; |
155 | }; | 166 | }; |
156 | 167 | ||
157 | serial@4500 { | 168 | serial0: serial@4500 { |
169 | cell-index = <0>; | ||
158 | device_type = "serial"; | 170 | device_type = "serial"; |
159 | compatible = "ns16550"; | 171 | compatible = "ns16550"; |
160 | reg = <4500 100>; | 172 | reg = <4500 100>; |
@@ -169,7 +181,8 @@ | |||
169 | fsl,has-rstcr; | 181 | fsl,has-rstcr; |
170 | }; | 182 | }; |
171 | 183 | ||
172 | serial@4600 { | 184 | serial1: serial@4600 { |
185 | cell-index = <1>; | ||
173 | device_type = "serial"; | 186 | device_type = "serial"; |
174 | compatible = "ns16550"; | 187 | compatible = "ns16550"; |
175 | reg = <4600 100>; | 188 | reg = <4600 100>; |
@@ -385,7 +398,8 @@ | |||
385 | 398 | ||
386 | }; | 399 | }; |
387 | 400 | ||
388 | pci@e0008000 { | 401 | pci0: pci@e0008000 { |
402 | cell-index = <0>; | ||
389 | interrupt-map-mask = <f800 0 0 7>; | 403 | interrupt-map-mask = <f800 0 0 7>; |
390 | interrupt-map = < | 404 | interrupt-map = < |
391 | /* IDSEL 0x12 AD18 */ | 405 | /* IDSEL 0x12 AD18 */ |
@@ -415,7 +429,8 @@ | |||
415 | }; | 429 | }; |
416 | 430 | ||
417 | /* PCI Express */ | 431 | /* PCI Express */ |
418 | pcie@e000a000 { | 432 | pci1: pcie@e000a000 { |
433 | cell-index = <2>; | ||
419 | interrupt-map-mask = <f800 0 0 7>; | 434 | interrupt-map-mask = <f800 0 0 7>; |
420 | interrupt-map = < | 435 | interrupt-map = < |
421 | 436 | ||
diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts index c2a8ffa61f8c..233e0d5a8b9d 100644 --- a/arch/powerpc/boot/dts/mpc8572ds.dts +++ b/arch/powerpc/boot/dts/mpc8572ds.dts | |||
@@ -15,6 +15,18 @@ | |||
15 | #address-cells = <1>; | 15 | #address-cells = <1>; |
16 | #size-cells = <1>; | 16 | #size-cells = <1>; |
17 | 17 | ||
18 | aliases { | ||
19 | ethernet0 = &enet0; | ||
20 | ethernet1 = &enet1; | ||
21 | ethernet2 = &enet2; | ||
22 | ethernet3 = &enet3; | ||
23 | serial0 = &serial0; | ||
24 | serial1 = &serial1; | ||
25 | pci0 = &pci0; | ||
26 | pci1 = &pci1; | ||
27 | pci2 = &pci2; | ||
28 | }; | ||
29 | |||
18 | cpus { | 30 | cpus { |
19 | #address-cells = <1>; | 31 | #address-cells = <1>; |
20 | #size-cells = <0>; | 32 | #size-cells = <0>; |
@@ -170,7 +182,8 @@ | |||
170 | phy-connection-type = "rgmii-id"; | 182 | phy-connection-type = "rgmii-id"; |
171 | }; | 183 | }; |
172 | 184 | ||
173 | serial@4500 { | 185 | serial0: serial@4500 { |
186 | cell-index = <0>; | ||
174 | device_type = "serial"; | 187 | device_type = "serial"; |
175 | compatible = "ns16550"; | 188 | compatible = "ns16550"; |
176 | reg = <4500 100>; | 189 | reg = <4500 100>; |
@@ -179,7 +192,8 @@ | |||
179 | interrupt-parent = <&mpic>; | 192 | interrupt-parent = <&mpic>; |
180 | }; | 193 | }; |
181 | 194 | ||
182 | serial@4600 { | 195 | serial1: serial@4600 { |
196 | cell-index = <1>; | ||
183 | device_type = "serial"; | 197 | device_type = "serial"; |
184 | compatible = "ns16550"; | 198 | compatible = "ns16550"; |
185 | reg = <4600 100>; | 199 | reg = <4600 100>; |
@@ -206,7 +220,8 @@ | |||
206 | }; | 220 | }; |
207 | }; | 221 | }; |
208 | 222 | ||
209 | pcie@ffe08000 { | 223 | pci0: pcie@ffe08000 { |
224 | cell-index = <0>; | ||
210 | compatible = "fsl,mpc8548-pcie"; | 225 | compatible = "fsl,mpc8548-pcie"; |
211 | device_type = "pci"; | 226 | device_type = "pci"; |
212 | #interrupt-cells = <1>; | 227 | #interrupt-cells = <1>; |
@@ -415,7 +430,8 @@ | |||
415 | 430 | ||
416 | }; | 431 | }; |
417 | 432 | ||
418 | pcie@ffe09000 { | 433 | pci1: pcie@ffe09000 { |
434 | cell-index = <1>; | ||
419 | compatible = "fsl,mpc8548-pcie"; | 435 | compatible = "fsl,mpc8548-pcie"; |
420 | device_type = "pci"; | 436 | device_type = "pci"; |
421 | #interrupt-cells = <1>; | 437 | #interrupt-cells = <1>; |
@@ -451,7 +467,8 @@ | |||
451 | }; | 467 | }; |
452 | }; | 468 | }; |
453 | 469 | ||
454 | pcie@ffe0a000 { | 470 | pci2: pcie@ffe0a000 { |
471 | cell-index = <2>; | ||
455 | compatible = "fsl,mpc8548-pcie"; | 472 | compatible = "fsl,mpc8548-pcie"; |
456 | device_type = "pci"; | 473 | device_type = "pci"; |
457 | #interrupt-cells = <1>; | 474 | #interrupt-cells = <1>; |
diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts index e9c444ed922f..01040a752c82 100644 --- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts +++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts | |||
@@ -15,6 +15,13 @@ | |||
15 | #address-cells = <1>; | 15 | #address-cells = <1>; |
16 | #size-cells = <1>; | 16 | #size-cells = <1>; |
17 | 17 | ||
18 | aliases { | ||
19 | serial0 = &serial0; | ||
20 | serial1 = &serial1; | ||
21 | pci0 = &pci0; | ||
22 | pci1 = &pci1; | ||
23 | }; | ||
24 | |||
18 | cpus { | 25 | cpus { |
19 | #address-cells = <1>; | 26 | #address-cells = <1>; |
20 | #size-cells = <0>; | 27 | #size-cells = <0>; |
@@ -68,7 +75,8 @@ | |||
68 | dfsrr; | 75 | dfsrr; |
69 | }; | 76 | }; |
70 | 77 | ||
71 | serial@4500 { | 78 | serial0: serial@4500 { |
79 | cell-index = <0>; | ||
72 | device_type = "serial"; | 80 | device_type = "serial"; |
73 | compatible = "ns16550"; | 81 | compatible = "ns16550"; |
74 | reg = <4500 100>; | 82 | reg = <4500 100>; |
@@ -77,7 +85,8 @@ | |||
77 | interrupt-parent = <&mpic>; | 85 | interrupt-parent = <&mpic>; |
78 | }; | 86 | }; |
79 | 87 | ||
80 | serial@4600 { | 88 | serial1: serial@4600 { |
89 | cell-index = <1>; | ||
81 | device_type = "serial"; | 90 | device_type = "serial"; |
82 | compatible = "ns16550"; | 91 | compatible = "ns16550"; |
83 | reg = <4600 100>; | 92 | reg = <4600 100>; |
@@ -86,7 +95,6 @@ | |||
86 | interrupt-parent = <&mpic>; | 95 | interrupt-parent = <&mpic>; |
87 | }; | 96 | }; |
88 | 97 | ||
89 | |||
90 | mpic: interrupt-controller@40000 { | 98 | mpic: interrupt-controller@40000 { |
91 | clock-frequency = <0>; | 99 | clock-frequency = <0>; |
92 | interrupt-controller; | 100 | interrupt-controller; |
@@ -105,7 +113,8 @@ | |||
105 | }; | 113 | }; |
106 | }; | 114 | }; |
107 | 115 | ||
108 | pci@e0008000 { | 116 | pci0: pci@e0008000 { |
117 | cell-index = <0>; | ||
109 | compatible = "fsl,mpc8610-pci"; | 118 | compatible = "fsl,mpc8610-pci"; |
110 | device_type = "pci"; | 119 | device_type = "pci"; |
111 | #interrupt-cells = <1>; | 120 | #interrupt-cells = <1>; |
@@ -134,7 +143,8 @@ | |||
134 | >; | 143 | >; |
135 | }; | 144 | }; |
136 | 145 | ||
137 | pcie@e000a000 { | 146 | pci1: pcie@e000a000 { |
147 | cell-index = <1>; | ||
138 | compatible = "fsl,mpc8641-pcie"; | 148 | compatible = "fsl,mpc8641-pcie"; |
139 | device_type = "pci"; | 149 | device_type = "pci"; |
140 | #interrupt-cells = <1>; | 150 | #interrupt-cells = <1>; |
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts index ddd8fbbb2171..86fc2280c16d 100644 --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts | |||
@@ -175,6 +175,7 @@ | |||
175 | }; | 175 | }; |
176 | 176 | ||
177 | serial0: serial@4500 { | 177 | serial0: serial@4500 { |
178 | cell-index = <0>; | ||
178 | device_type = "serial"; | 179 | device_type = "serial"; |
179 | compatible = "ns16550"; | 180 | compatible = "ns16550"; |
180 | reg = <4500 100>; | 181 | reg = <4500 100>; |
@@ -184,6 +185,7 @@ | |||
184 | }; | 185 | }; |
185 | 186 | ||
186 | serial1: serial@4600 { | 187 | serial1: serial@4600 { |
188 | cell-index = <1>; | ||
187 | device_type = "serial"; | 189 | device_type = "serial"; |
188 | compatible = "ns16550"; | 190 | compatible = "ns16550"; |
189 | reg = <4600 100>; | 191 | reg = <4600 100>; |
@@ -211,6 +213,7 @@ | |||
211 | }; | 213 | }; |
212 | 214 | ||
213 | pci0: pcie@f8008000 { | 215 | pci0: pcie@f8008000 { |
216 | cell-index = <0>; | ||
214 | compatible = "fsl,mpc8641-pcie"; | 217 | compatible = "fsl,mpc8641-pcie"; |
215 | device_type = "pci"; | 218 | device_type = "pci"; |
216 | #interrupt-cells = <1>; | 219 | #interrupt-cells = <1>; |
@@ -419,6 +422,7 @@ | |||
419 | }; | 422 | }; |
420 | 423 | ||
421 | pci1: pcie@f8009000 { | 424 | pci1: pcie@f8009000 { |
425 | cell-index = <1>; | ||
422 | compatible = "fsl,mpc8641-pcie"; | 426 | compatible = "fsl,mpc8641-pcie"; |
423 | device_type = "pci"; | 427 | device_type = "pci"; |
424 | #interrupt-cells = <1>; | 428 | #interrupt-cells = <1>; |