aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorMark A. Greer <mgreer@mvista.com>2008-04-07 18:07:08 -0400
committerPaul Mackerras <paulus@samba.org>2008-04-15 07:21:23 -0400
commitd528be50c616ff2b1f2259589730608a1d348d63 (patch)
tree71dc804cb44aac3aac187bcb04beae5d7be1d74a /arch/powerpc
parent53bcddb915533c2c41d590e386502a50effd1a21 (diff)
[POWERPC] prpmc2800: Convert DTS to v1 and add labels
Update the prpmc2800 DTS file to version 1 and add labels. I verified that there was no change in the resulting dtb file. Signed-off-by: Mark A. Greer <mgreer@mvista.com> Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/boot/dts/prpmc2800.dts264
1 files changed, 134 insertions, 130 deletions
diff --git a/arch/powerpc/boot/dts/prpmc2800.dts b/arch/powerpc/boot/dts/prpmc2800.dts
index 297dfa53fe9e..b96b400dc3bd 100644
--- a/arch/powerpc/boot/dts/prpmc2800.dts
+++ b/arch/powerpc/boot/dts/prpmc2800.dts
@@ -11,6 +11,8 @@
11 * if it can determine the exact PrPMC type. 11 * if it can determine the exact PrPMC type.
12 */ 12 */
13 13
14/dts-v1/;
15
14/ { 16/ {
15 #address-cells = <1>; 17 #address-cells = <1>;
16 #size-cells = <1>; 18 #size-cells = <1>;
@@ -25,19 +27,19 @@
25 PowerPC,7447 { 27 PowerPC,7447 {
26 device_type = "cpu"; 28 device_type = "cpu";
27 reg = <0>; 29 reg = <0>;
28 clock-frequency = <2bb0b140>; /* Default (733 MHz) */ 30 clock-frequency = <733000000>; /* Default */
29 bus-frequency = <7f28155>; /* 133.333333 MHz */ 31 bus-frequency = <133333333>;
30 timebase-frequency = <1fca055>; /* 33.333333 MHz */ 32 timebase-frequency = <33333333>;
31 i-cache-line-size = <20>; 33 i-cache-line-size = <32>;
32 d-cache-line-size = <20>; 34 d-cache-line-size = <32>;
33 i-cache-size = <8000>; 35 i-cache-size = <32768>;
34 d-cache-size = <8000>; 36 d-cache-size = <32768>;
35 }; 37 };
36 }; 38 };
37 39
38 memory { 40 memory {
39 device_type = "memory"; 41 device_type = "memory";
40 reg = <00000000 20000000>; /* Default (512MB) */ 42 reg = <0x0 0x20000000>; /* Default (512MB) */
41 }; 43 };
42 44
43 mv64x60@f1000000 { /* Marvell Discovery */ 45 mv64x60@f1000000 { /* Marvell Discovery */
@@ -45,26 +47,26 @@
45 #size-cells = <1>; 47 #size-cells = <1>;
46 model = "mv64360"; /* Default */ 48 model = "mv64360"; /* Default */
47 compatible = "marvell,mv64x60"; 49 compatible = "marvell,mv64x60";
48 clock-frequency = <7f28155>; /* 133.333333 MHz */ 50 clock-frequency = <133333333>;
49 reg = <f1000000 00010000>; 51 reg = <0xf1000000 0x10000>;
50 virtual-reg = <f1000000>; 52 virtual-reg = <0xf1000000>;
51 ranges = <88000000 88000000 01000000 /* PCI 0 I/O Space */ 53 ranges = <0x88000000 0x88000000 0x1000000 /* PCI 0 I/O Space */
52 80000000 80000000 08000000 /* PCI 0 MEM Space */ 54 0x80000000 0x80000000 0x8000000 /* PCI 0 MEM Space */
53 a0000000 a0000000 04000000 /* User FLASH */ 55 0xa0000000 0xa0000000 0x4000000 /* User FLASH */
54 00000000 f1000000 00010000 /* Bridge's regs */ 56 0x00000000 0xf1000000 0x0010000 /* Bridge's regs */
55 f2000000 f2000000 00040000>; /* Integrated SRAM */ 57 0xf2000000 0xf2000000 0x0040000>;/* Integrated SRAM */
56 58
57 flash@a0000000 { 59 flash@a0000000 {
58 device_type = "rom"; 60 device_type = "rom";
59 compatible = "direct-mapped"; 61 compatible = "direct-mapped";
60 reg = <a0000000 4000000>; /* Default (64MB) */ 62 reg = <0xa0000000 0x4000000>; /* Default (64MB) */
61 probe-type = "CFI"; 63 probe-type = "CFI";
62 bank-width = <4>; 64 bank-width = <4>;
63 partitions = <00000000 00100000 /* RO */ 65 partitions = <0x00000000 0x00100000 /* RO */
64 00100000 00040001 /* RW */ 66 0x00100000 0x00040001 /* RW */
65 00140000 00400000 /* RO */ 67 0x00140000 0x00400000 /* RO */
66 00540000 039c0000 /* RO */ 68 0x00540000 0x039c0000 /* RO */
67 03f00000 00100000>; /* RO */ 69 0x03f00000 0x00100000>; /* RO */
68 partition-names = "FW Image A", "FW Config Data", "Kernel Image", "Filesystem", "FW Image B"; 70 partition-names = "FW Image A", "FW Config Data", "Kernel Image", "Filesystem", "FW Image B";
69 }; 71 };
70 72
@@ -73,170 +75,170 @@
73 #size-cells = <0>; 75 #size-cells = <0>;
74 device_type = "mdio"; 76 device_type = "mdio";
75 compatible = "marvell,mv64x60-mdio"; 77 compatible = "marvell,mv64x60-mdio";
76 ethernet-phy@1 { 78 PHY0: ethernet-phy@1 {
77 device_type = "ethernet-phy"; 79 device_type = "ethernet-phy";
78 compatible = "broadcom,bcm5421"; 80 compatible = "broadcom,bcm5421";
79 interrupts = <4c>; /* GPP 12 */ 81 interrupts = <76>; /* GPP 12 */
80 interrupt-parent = <&/mv64x60/pic>; 82 interrupt-parent = <&PIC>;
81 reg = <1>; 83 reg = <1>;
82 }; 84 };
83 ethernet-phy@3 { 85 PHY1: ethernet-phy@3 {
84 device_type = "ethernet-phy"; 86 device_type = "ethernet-phy";
85 compatible = "broadcom,bcm5421"; 87 compatible = "broadcom,bcm5421";
86 interrupts = <4c>; /* GPP 12 */ 88 interrupts = <76>; /* GPP 12 */
87 interrupt-parent = <&/mv64x60/pic>; 89 interrupt-parent = <&PIC>;
88 reg = <3>; 90 reg = <3>;
89 }; 91 };
90 }; 92 };
91 93
92 ethernet@2000 { 94 ethernet@2000 {
93 reg = <2000 2000>; 95 reg = <0x2000 0x2000>;
94 eth0 { 96 eth0 {
95 device_type = "network"; 97 device_type = "network";
96 compatible = "marvell,mv64x60-eth"; 98 compatible = "marvell,mv64x60-eth";
97 block-index = <0>; 99 block-index = <0>;
98 interrupts = <20>; 100 interrupts = <32>;
99 interrupt-parent = <&/mv64x60/pic>; 101 interrupt-parent = <&PIC>;
100 phy = <&/mv64x60/mdio/ethernet-phy@1>; 102 phy = <&PHY0>;
101 local-mac-address = [ 00 00 00 00 00 00 ]; 103 local-mac-address = [ 00 00 00 00 00 00 ];
102 }; 104 };
103 eth1 { 105 eth1 {
104 device_type = "network"; 106 device_type = "network";
105 compatible = "marvell,mv64x60-eth"; 107 compatible = "marvell,mv64x60-eth";
106 block-index = <1>; 108 block-index = <1>;
107 interrupts = <21>; 109 interrupts = <33>;
108 interrupt-parent = <&/mv64x60/pic>; 110 interrupt-parent = <&PIC>;
109 phy = <&/mv64x60/mdio/ethernet-phy@3>; 111 phy = <&PHY1>;
110 local-mac-address = [ 00 00 00 00 00 00 ]; 112 local-mac-address = [ 00 00 00 00 00 00 ];
111 }; 113 };
112 }; 114 };
113 115
114 sdma@4000 { 116 SDMA0: sdma@4000 {
115 device_type = "dma"; 117 device_type = "dma";
116 compatible = "marvell,mv64x60-sdma"; 118 compatible = "marvell,mv64x60-sdma";
117 reg = <4000 c18>; 119 reg = <0x4000 0xc18>;
118 virtual-reg = <f1004000>; 120 virtual-reg = <0xf1004000>;
119 interrupt-base = <0>; 121 interrupt-base = <0>;
120 interrupts = <24>; 122 interrupts = <36>;
121 interrupt-parent = <&/mv64x60/pic>; 123 interrupt-parent = <&PIC>;
122 }; 124 };
123 125
124 sdma@6000 { 126 SDMA1: sdma@6000 {
125 device_type = "dma"; 127 device_type = "dma";
126 compatible = "marvell,mv64x60-sdma"; 128 compatible = "marvell,mv64x60-sdma";
127 reg = <6000 c18>; 129 reg = <0x6000 0xc18>;
128 virtual-reg = <f1006000>; 130 virtual-reg = <0xf1006000>;
129 interrupt-base = <0>; 131 interrupt-base = <0>;
130 interrupts = <26>; 132 interrupts = <38>;
131 interrupt-parent = <&/mv64x60/pic>; 133 interrupt-parent = <&PIC>;
132 }; 134 };
133 135
134 brg@b200 { 136 BRG0: brg@b200 {
135 compatible = "marvell,mv64x60-brg"; 137 compatible = "marvell,mv64x60-brg";
136 reg = <b200 8>; 138 reg = <0xb200 0x8>;
137 clock-src = <8>; 139 clock-src = <8>;
138 clock-frequency = <7ed6b40>; 140 clock-frequency = <133000000>;
139 current-speed = <2580>; 141 current-speed = <9600>;
140 bcr = <0>; 142 bcr = <0>;
141 }; 143 };
142 144
143 brg@b208 { 145 BRG1: brg@b208 {
144 compatible = "marvell,mv64x60-brg"; 146 compatible = "marvell,mv64x60-brg";
145 reg = <b208 8>; 147 reg = <0xb208 0x8>;
146 clock-src = <8>; 148 clock-src = <8>;
147 clock-frequency = <7ed6b40>; 149 clock-frequency = <133000000>;
148 current-speed = <2580>; 150 current-speed = <9600>;
149 bcr = <0>; 151 bcr = <0>;
150 }; 152 };
151 153
152 cunit@f200 { 154 CUNIT: cunit@f200 {
153 reg = <f200 200>; 155 reg = <0xf200 0x200>;
154 }; 156 };
155 157
156 mpscrouting@b400 { 158 MPSCROUTING: mpscrouting@b400 {
157 reg = <b400 c>; 159 reg = <0xb400 0xc>;
158 }; 160 };
159 161
160 mpscintr@b800 { 162 MPSCINTR: mpscintr@b800 {
161 reg = <b800 100>; 163 reg = <0xb800 0x100>;
162 virtual-reg = <f100b800>; 164 virtual-reg = <0xf100b800>;
163 }; 165 };
164 166
165 mpsc@8000 { 167 MPSC0: mpsc@8000 {
166 device_type = "serial"; 168 device_type = "serial";
167 compatible = "marvell,mpsc"; 169 compatible = "marvell,mpsc";
168 reg = <8000 38>; 170 reg = <0x8000 0x38>;
169 virtual-reg = <f1008000>; 171 virtual-reg = <0xf1008000>;
170 sdma = <&/mv64x60/sdma@4000>; 172 sdma = <&SDMA0>;
171 brg = <&/mv64x60/brg@b200>; 173 brg = <&BRG0>;
172 cunit = <&/mv64x60/cunit@f200>; 174 cunit = <&CUNIT>;
173 mpscrouting = <&/mv64x60/mpscrouting@b400>; 175 mpscrouting = <&MPSCROUTING>;
174 mpscintr = <&/mv64x60/mpscintr@b800>; 176 mpscintr = <&MPSCINTR>;
175 block-index = <0>; 177 block-index = <0>;
176 max_idle = <28>; 178 max_idle = <40>;
177 chr_1 = <0>; 179 chr_1 = <0>;
178 chr_2 = <0>; 180 chr_2 = <0>;
179 chr_10 = <3>; 181 chr_10 = <3>;
180 mpcr = <0>; 182 mpcr = <0>;
181 interrupts = <28>; 183 interrupts = <40>;
182 interrupt-parent = <&/mv64x60/pic>; 184 interrupt-parent = <&PIC>;
183 }; 185 };
184 186
185 mpsc@9000 { 187 MPSC1: mpsc@9000 {
186 device_type = "serial"; 188 device_type = "serial";
187 compatible = "marvell,mpsc"; 189 compatible = "marvell,mpsc";
188 reg = <9000 38>; 190 reg = <0x9000 0x38>;
189 virtual-reg = <f1009000>; 191 virtual-reg = <0xf1009000>;
190 sdma = <&/mv64x60/sdma@6000>; 192 sdma = <&SDMA1>;
191 brg = <&/mv64x60/brg@b208>; 193 brg = <&BRG1>;
192 cunit = <&/mv64x60/cunit@f200>; 194 cunit = <&CUNIT>;
193 mpscrouting = <&/mv64x60/mpscrouting@b400>; 195 mpscrouting = <&MPSCROUTING>;
194 mpscintr = <&/mv64x60/mpscintr@b800>; 196 mpscintr = <&MPSCINTR>;
195 block-index = <1>; 197 block-index = <1>;
196 max_idle = <28>; 198 max_idle = <40>;
197 chr_1 = <0>; 199 chr_1 = <0>;
198 chr_2 = <0>; 200 chr_2 = <0>;
199 chr_10 = <3>; 201 chr_10 = <3>;
200 mpcr = <0>; 202 mpcr = <0>;
201 interrupts = <2a>; 203 interrupts = <42>;
202 interrupt-parent = <&/mv64x60/pic>; 204 interrupt-parent = <&PIC>;
203 }; 205 };
204 206
205 wdt@b410 { /* watchdog timer */ 207 wdt@b410 { /* watchdog timer */
206 compatible = "marvell,mv64x60-wdt"; 208 compatible = "marvell,mv64x60-wdt";
207 reg = <b410 8>; 209 reg = <0xb410 0x8>;
208 timeout = <a>; /* wdt timeout in seconds */ 210 timeout = <10>; /* wdt timeout in seconds */
209 }; 211 };
210 212
211 i2c@c000 { 213 i2c@c000 {
212 device_type = "i2c"; 214 device_type = "i2c";
213 compatible = "marvell,mv64x60-i2c"; 215 compatible = "marvell,mv64x60-i2c";
214 reg = <c000 20>; 216 reg = <0xc000 0x20>;
215 virtual-reg = <f100c000>; 217 virtual-reg = <0xf100c000>;
216 freq_m = <8>; 218 freq_m = <8>;
217 freq_n = <3>; 219 freq_n = <3>;
218 timeout = <3e8>; /* 1000 = 1 second */ 220 timeout = <1000>; /* 1000 = 1 second */
219 retries = <1>; 221 retries = <1>;
220 interrupts = <25>; 222 interrupts = <37>;
221 interrupt-parent = <&/mv64x60/pic>; 223 interrupt-parent = <&PIC>;
222 }; 224 };
223 225
224 pic { 226 PIC: pic {
225 #interrupt-cells = <1>; 227 #interrupt-cells = <1>;
226 #address-cells = <0>; 228 #address-cells = <0>;
227 compatible = "marvell,mv64x60-pic"; 229 compatible = "marvell,mv64x60-pic";
228 reg = <0000 88>; 230 reg = <0x0 0x88>;
229 interrupt-controller; 231 interrupt-controller;
230 }; 232 };
231 233
232 mpp@f000 { 234 mpp@f000 {
233 compatible = "marvell,mv64x60-mpp"; 235 compatible = "marvell,mv64x60-mpp";
234 reg = <f000 10>; 236 reg = <0xf000 0x10>;
235 }; 237 };
236 238
237 gpp@f100 { 239 gpp@f100 {
238 compatible = "marvell,mv64x60-gpp"; 240 compatible = "marvell,mv64x60-gpp";
239 reg = <f100 20>; 241 reg = <0xf100 0x20>;
240 }; 242 };
241 243
242 pci@80000000 { 244 pci@80000000 {
@@ -245,72 +247,74 @@
245 #interrupt-cells = <1>; 247 #interrupt-cells = <1>;
246 device_type = "pci"; 248 device_type = "pci";
247 compatible = "marvell,mv64x60-pci"; 249 compatible = "marvell,mv64x60-pci";
248 reg = <0cf8 8>; 250 reg = <0xcf8 0x8>;
249 ranges = <01000000 0 0 88000000 0 01000000 251 ranges = <0x01000000 0x0 0x0
250 02000000 0 80000000 80000000 0 08000000>; 252 0x88000000 0x0 0x01000000
251 bus-range = <0 ff>; 253 0x02000000 0x0 0x80000000
252 clock-frequency = <3EF1480>; 254 0x80000000 0x0 0x08000000>;
253 interrupt-pci-iack = <0c34>; 255 bus-range = <0 255>;
254 interrupt-parent = <&/mv64x60/pic>; 256 clock-frequency = <66000000>;
255 interrupt-map-mask = <f800 0 0 7>; 257 interrupt-pci-iack = <0xc34>;
258 interrupt-parent = <&PIC>;
259 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
256 interrupt-map = < 260 interrupt-map = <
257 /* IDSEL 0x0a */ 261 /* IDSEL 0x0a */
258 5000 0 0 1 &/mv64x60/pic 50 262 0x5000 0 0 1 &PIC 80
259 5000 0 0 2 &/mv64x60/pic 51 263 0x5000 0 0 2 &PIC 81
260 5000 0 0 3 &/mv64x60/pic 5b 264 0x5000 0 0 3 &PIC 91
261 5000 0 0 4 &/mv64x60/pic 5d 265 0x5000 0 0 4 &PIC 93
262 266
263 /* IDSEL 0x0b */ 267 /* IDSEL 0x0b */
264 5800 0 0 1 &/mv64x60/pic 5b 268 0x5800 0 0 1 &PIC 91
265 5800 0 0 2 &/mv64x60/pic 5d 269 0x5800 0 0 2 &PIC 93
266 5800 0 0 3 &/mv64x60/pic 50 270 0x5800 0 0 3 &PIC 80
267 5800 0 0 4 &/mv64x60/pic 51 271 0x5800 0 0 4 &PIC 81
268 272
269 /* IDSEL 0x0c */ 273 /* IDSEL 0x0c */
270 6000 0 0 1 &/mv64x60/pic 5b 274 0x6000 0 0 1 &PIC 91
271 6000 0 0 2 &/mv64x60/pic 5d 275 0x6000 0 0 2 &PIC 93
272 6000 0 0 3 &/mv64x60/pic 50 276 0x6000 0 0 3 &PIC 80
273 6000 0 0 4 &/mv64x60/pic 51 277 0x6000 0 0 4 &PIC 81
274 278
275 /* IDSEL 0x0d */ 279 /* IDSEL 0x0d */
276 6800 0 0 1 &/mv64x60/pic 5d 280 0x6800 0 0 1 &PIC 93
277 6800 0 0 2 &/mv64x60/pic 50 281 0x6800 0 0 2 &PIC 80
278 6800 0 0 3 &/mv64x60/pic 51 282 0x6800 0 0 3 &PIC 81
279 6800 0 0 4 &/mv64x60/pic 5b 283 0x6800 0 0 4 &PIC 91
280 >; 284 >;
281 }; 285 };
282 286
283 cpu-error@0070 { 287 cpu-error@0070 {
284 compatible = "marvell,mv64x60-cpu-error"; 288 compatible = "marvell,mv64x60-cpu-error";
285 reg = <0070 10 0128 28>; 289 reg = <0x70 0x10 0x128 0x28>;
286 interrupts = <03>; 290 interrupts = <3>;
287 interrupt-parent = <&/mv64x60/pic>; 291 interrupt-parent = <&PIC>;
288 }; 292 };
289 293
290 sram-ctrl@0380 { 294 sram-ctrl@0380 {
291 compatible = "marvell,mv64x60-sram-ctrl"; 295 compatible = "marvell,mv64x60-sram-ctrl";
292 reg = <0380 80>; 296 reg = <0x380 0x80>;
293 interrupts = <0d>; 297 interrupts = <13>;
294 interrupt-parent = <&/mv64x60/pic>; 298 interrupt-parent = <&PIC>;
295 }; 299 };
296 300
297 pci-error@1d40 { 301 pci-error@1d40 {
298 compatible = "marvell,mv64x60-pci-error"; 302 compatible = "marvell,mv64x60-pci-error";
299 reg = <1d40 40 0c28 4>; 303 reg = <0x1d40 0x40 0xc28 0x4>;
300 interrupts = <0c>; 304 interrupts = <12>;
301 interrupt-parent = <&/mv64x60/pic>; 305 interrupt-parent = <&PIC>;
302 }; 306 };
303 307
304 mem-ctrl@1400 { 308 mem-ctrl@1400 {
305 compatible = "marvell,mv64x60-mem-ctrl"; 309 compatible = "marvell,mv64x60-mem-ctrl";
306 reg = <1400 60>; 310 reg = <0x1400 0x60>;
307 interrupts = <11>; 311 interrupts = <17>;
308 interrupt-parent = <&/mv64x60/pic>; 312 interrupt-parent = <&PIC>;
309 }; 313 };
310 }; 314 };
311 315
312 chosen { 316 chosen {
313 bootargs = "ip=on"; 317 bootargs = "ip=on";
314 linux,stdout-path = "/mv64x60@f1000000/mpsc@8000"; 318 linux,stdout-path = &MPSC0;
315 }; 319 };
316}; 320};
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-01 17:24:47 -0500