diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:50:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:50:19 -0400 |
commit | df6d3916f3b7b7e2067567a256dd4f0c1ea854a2 (patch) | |
tree | 0fdeab1ab5d566605fc99aeb5ea3f621f11e7608 /arch/powerpc/boot/dts | |
parent | 74add80cbd7fe246c893b93ee75ac59acdd01dd4 (diff) | |
parent | 197686dfe0038fd190326d118b743ff65ad20c0e (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (77 commits)
[POWERPC] Abolish powerpc_flash_init()
[POWERPC] Early serial debug support for PPC44x
[POWERPC] Support for the Ebony 440GP reference board in arch/powerpc
[POWERPC] Add device tree for Ebony
[POWERPC] Add powerpc/platforms/44x, disable platforms/4xx for now
[POWERPC] MPIC U3/U4 MSI backend
[POWERPC] MPIC MSI allocator
[POWERPC] Enable MSI mappings for MPIC
[POWERPC] Tell Phyp we support MSI
[POWERPC] RTAS MSI implementation
[POWERPC] PowerPC MSI infrastructure
[POWERPC] Rip out the existing powerpc msi stubs
[POWERPC] Remove use of 4level-fixup.h for ppc32
[POWERPC] Add powerpc PCI-E reset API implementation
[POWERPC] Holly bootwrapper
[POWERPC] Holly DTS
[POWERPC] Holly defconfig
[POWERPC] Add support for 750CL Holly board
[POWERPC] Generalize tsi108 PCI setup
[POWERPC] Generalize tsi108 PHY types
...
Fixed conflict in include/asm-powerpc/kdebug.h manually
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/powerpc/boot/dts')
-rw-r--r-- | arch/powerpc/boot/dts/ebony.dts | 307 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/holly.dts | 198 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/lite5200.dts | 11 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/lite5200b.dts | 11 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc832x_mds.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc832x_rdb.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc836x_mds.dts | 4 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8568mds.dts | 6 |
8 files changed, 523 insertions, 18 deletions
diff --git a/arch/powerpc/boot/dts/ebony.dts b/arch/powerpc/boot/dts/ebony.dts new file mode 100644 index 000000000000..b67918651c48 --- /dev/null +++ b/arch/powerpc/boot/dts/ebony.dts | |||
@@ -0,0 +1,307 @@ | |||
1 | /* | ||
2 | * Device Tree Source for IBM Ebony | ||
3 | * | ||
4 | * Copyright (c) 2006, 2007 IBM Corp. | ||
5 | * Josh Boyer <jwboyer@linux.vnet.ibm.com>, David Gibson <dwg@au1.ibm.com> | ||
6 | * | ||
7 | * FIXME: Draft only! | ||
8 | * | ||
9 | * This file is licensed under the terms of the GNU General Public | ||
10 | * License version 2. This program is licensed "as is" without | ||
11 | * any warranty of any kind, whether express or implied. | ||
12 | * | ||
13 | * To build: | ||
14 | * dtc -I dts -O asm -o ebony.S -b 0 ebony.dts | ||
15 | * dtc -I dts -O dtb -o ebony.dtb -b 0 ebony.dts | ||
16 | */ | ||
17 | |||
18 | / { | ||
19 | #address-cells = <2>; | ||
20 | #size-cells = <1>; | ||
21 | model = "ibm,ebony"; | ||
22 | compatible = "ibm,ebony"; | ||
23 | dcr-parent = <&/cpus/PowerPC,440GP@0>; | ||
24 | |||
25 | cpus { | ||
26 | #address-cells = <1>; | ||
27 | #size-cells = <0>; | ||
28 | |||
29 | PowerPC,440GP@0 { | ||
30 | device_type = "cpu"; | ||
31 | reg = <0>; | ||
32 | clock-frequency = <0>; // Filled in by zImage | ||
33 | timebase-frequency = <0>; // Filled in by zImage | ||
34 | i-cache-line-size = <32>; | ||
35 | d-cache-line-size = <32>; | ||
36 | i-cache-size = <0>; | ||
37 | d-cache-size = <0>; | ||
38 | dcr-controller; | ||
39 | dcr-access-method = "native"; | ||
40 | }; | ||
41 | }; | ||
42 | |||
43 | memory { | ||
44 | device_type = "memory"; | ||
45 | reg = <0 0 0>; // Filled in by zImage | ||
46 | }; | ||
47 | |||
48 | UIC0: interrupt-controller0 { | ||
49 | device_type = "ibm,uic"; | ||
50 | compatible = "ibm,uic-440gp", "ibm,uic"; | ||
51 | interrupt-controller; | ||
52 | cell-index = <0>; | ||
53 | dcr-reg = <0c0 009>; | ||
54 | #address-cells = <0>; | ||
55 | #size-cells = <0>; | ||
56 | #interrupt-cells = <2>; | ||
57 | |||
58 | }; | ||
59 | |||
60 | UIC1: interrupt-controller1 { | ||
61 | device_type = "ibm,uic"; | ||
62 | compatible = "ibm,uic-440gp", "ibm,uic"; | ||
63 | interrupt-controller; | ||
64 | cell-index = <1>; | ||
65 | dcr-reg = <0d0 009>; | ||
66 | #address-cells = <0>; | ||
67 | #size-cells = <0>; | ||
68 | #interrupt-cells = <2>; | ||
69 | interrupts = <1e 4 1f 4>; /* cascade */ | ||
70 | interrupt-parent = <&UIC0>; | ||
71 | }; | ||
72 | |||
73 | CPC0: cpc { | ||
74 | device_type = "ibm,cpc"; | ||
75 | compatible = "ibm,cpc-440gp"; | ||
76 | dcr-reg = <0b0 003 0e0 010>; | ||
77 | // FIXME: anything else? | ||
78 | }; | ||
79 | |||
80 | plb { | ||
81 | device_type = "ibm,plb"; | ||
82 | compatible = "ibm,plb-440gp", "ibm,plb4"; | ||
83 | #address-cells = <2>; | ||
84 | #size-cells = <1>; | ||
85 | ranges; | ||
86 | clock-frequency = <0>; // Filled in by zImage | ||
87 | |||
88 | SDRAM0: sdram { | ||
89 | device_type = "memory-controller"; | ||
90 | compatible = "ibm,sdram-440gp", "ibm,sdram"; | ||
91 | dcr-reg = <010 2>; | ||
92 | // FIXME: anything else? | ||
93 | }; | ||
94 | |||
95 | DMA0: dma { | ||
96 | // FIXME: ??? | ||
97 | device_type = "ibm,dma-4xx"; | ||
98 | compatible = "ibm,dma-440gp", "ibm,dma-4xx"; | ||
99 | dcr-reg = <100 027>; | ||
100 | }; | ||
101 | |||
102 | MAL0: mcmal { | ||
103 | device_type = "mcmal-dma"; | ||
104 | compatible = "ibm,mcmal-440gp", "ibm,mcmal"; | ||
105 | dcr-reg = <180 62>; | ||
106 | num-tx-chans = <4>; | ||
107 | num-rx-chans = <4>; | ||
108 | interrupt-parent = <&MAL0>; | ||
109 | interrupts = <0 1 2 3 4>; | ||
110 | #interrupt-cells = <1>; | ||
111 | #address-cells = <0>; | ||
112 | #size-cells = <0>; | ||
113 | interrupt-map = </*TXEOB*/ 0 &UIC0 a 4 | ||
114 | /*RXEOB*/ 1 &UIC0 b 4 | ||
115 | /*SERR*/ 2 &UIC1 0 4 | ||
116 | /*TXDE*/ 3 &UIC1 1 4 | ||
117 | /*RXDE*/ 4 &UIC1 2 4>; | ||
118 | interrupt-map-mask = <ffffffff>; | ||
119 | }; | ||
120 | |||
121 | POB0: opb { | ||
122 | device_type = "ibm,opb"; | ||
123 | compatible = "ibm,opb-440gp", "ibm,opb"; | ||
124 | #address-cells = <1>; | ||
125 | #size-cells = <1>; | ||
126 | /* Wish there was a nicer way of specifying a full 32-bit | ||
127 | range */ | ||
128 | ranges = <00000000 1 00000000 80000000 | ||
129 | 80000000 1 80000000 80000000>; | ||
130 | dcr-reg = <090 00b>; | ||
131 | interrupt-parent = <&UIC1>; | ||
132 | interrupts = <7 4>; | ||
133 | clock-frequency = <0>; // Filled in by zImage | ||
134 | |||
135 | EBC0: ebc { | ||
136 | device_type = "ibm,ebc"; | ||
137 | compatible = "ibm,ebc-440gp"; | ||
138 | dcr-reg = <012 2>; | ||
139 | #address-cells = <2>; | ||
140 | #size-cells = <1>; | ||
141 | clock-frequency = <0>; // Filled in by zImage | ||
142 | ranges = <0 00000000 fff00000 100000 | ||
143 | 1 00000000 48000000 100000 | ||
144 | 2 00000000 ff800000 400000 | ||
145 | 3 00000000 48200000 100000 | ||
146 | 7 00000000 48300000 100000>; | ||
147 | interrupts = <5 4>; | ||
148 | interrupt-parent = <&UIC1>; | ||
149 | |||
150 | small-flash@0,0 { | ||
151 | device_type = "rom"; | ||
152 | compatible = "direct-mapped"; | ||
153 | probe-type = "JEDEC"; | ||
154 | bank-width = <1>; | ||
155 | partitions = <0 80000>; | ||
156 | partition-names = "OpenBIOS"; | ||
157 | reg = <0 80000 80000>; | ||
158 | }; | ||
159 | |||
160 | ds1743@1,0 { | ||
161 | /* NVRAM & RTC */ | ||
162 | device_type = "nvram"; | ||
163 | compatible = "ds1743"; | ||
164 | reg = <1 0 2000>; | ||
165 | }; | ||
166 | |||
167 | large-flash@2,0 { | ||
168 | device_type = "rom"; | ||
169 | compatible = "direct-mapped"; | ||
170 | probe-type = "JEDEC"; | ||
171 | bank-width = <1>; | ||
172 | partitions = <0 380000 | ||
173 | 280000 80000>; | ||
174 | partition-names = "fs", "firmware"; | ||
175 | reg = <2 0 400000>; | ||
176 | }; | ||
177 | |||
178 | ir@3,0 { | ||
179 | reg = <3 0 10>; | ||
180 | }; | ||
181 | |||
182 | fpga@7,0 { | ||
183 | compatible = "Ebony-FPGA"; | ||
184 | reg = <7 0 10>; | ||
185 | }; | ||
186 | }; | ||
187 | |||
188 | UART0: serial@40000200 { | ||
189 | device_type = "serial"; | ||
190 | compatible = "ns16550"; | ||
191 | reg = <40000200 8>; | ||
192 | virtual-reg = <e0000200>; | ||
193 | clock-frequency = <A8C000>; | ||
194 | current-speed = <2580>; | ||
195 | interrupt-parent = <&UIC0>; | ||
196 | interrupts = <0 4>; | ||
197 | }; | ||
198 | |||
199 | UART1: serial@40000300 { | ||
200 | device_type = "serial"; | ||
201 | compatible = "ns16550"; | ||
202 | reg = <40000300 8>; | ||
203 | virtual-reg = <e0000300>; | ||
204 | clock-frequency = <A8C000>; | ||
205 | current-speed = <2580>; | ||
206 | interrupt-parent = <&UIC0>; | ||
207 | interrupts = <1 4>; | ||
208 | }; | ||
209 | |||
210 | IIC0: i2c@40000400 { | ||
211 | /* FIXME */ | ||
212 | device_type = "i2c"; | ||
213 | compatible = "ibm,iic-440gp", "ibm,iic"; | ||
214 | reg = <40000400 14>; | ||
215 | interrupt-parent = <&UIC0>; | ||
216 | interrupts = <2 4>; | ||
217 | }; | ||
218 | IIC1: i2c@40000500 { | ||
219 | /* FIXME */ | ||
220 | device_type = "i2c"; | ||
221 | compatible = "ibm,iic-440gp", "ibm,iic"; | ||
222 | reg = <40000500 14>; | ||
223 | interrupt-parent = <&UIC0>; | ||
224 | interrupts = <3 4>; | ||
225 | }; | ||
226 | |||
227 | GPIO0: gpio@40000700 { | ||
228 | /* FIXME */ | ||
229 | device_type = "gpio"; | ||
230 | compatible = "ibm,gpio-440gp"; | ||
231 | reg = <40000700 20>; | ||
232 | }; | ||
233 | |||
234 | ZMII0: emac-zmii@40000780 { | ||
235 | device_type = "emac-zmii"; | ||
236 | compatible = "ibm,zmii-440gp", "ibm,zmii"; | ||
237 | reg = <40000780 c>; | ||
238 | }; | ||
239 | |||
240 | EMAC0: ethernet@40000800 { | ||
241 | linux,network-index = <0>; | ||
242 | device_type = "network"; | ||
243 | compatible = "ibm,emac-440gp", "ibm,emac"; | ||
244 | interrupt-parent = <&UIC1>; | ||
245 | interrupts = <1c 4 1d 4>; | ||
246 | reg = <40000800 70>; | ||
247 | local-mac-address = [000000000000]; // Filled in by zImage | ||
248 | mal-device = <&MAL0>; | ||
249 | mal-tx-channel = <0 1>; | ||
250 | mal-rx-channel = <0>; | ||
251 | cell-index = <0>; | ||
252 | max-frame-size = <5dc>; | ||
253 | rx-fifo-size = <1000>; | ||
254 | tx-fifo-size = <800>; | ||
255 | phy-mode = "rmii"; | ||
256 | phy-map = <00000001>; | ||
257 | zmii-device = <&ZMII0>; | ||
258 | zmii-channel = <0>; | ||
259 | }; | ||
260 | EMAC1: ethernet@40000900 { | ||
261 | linux,network-index = <1>; | ||
262 | device_type = "network"; | ||
263 | compatible = "ibm,emac-440gp", "ibm,emac"; | ||
264 | interrupt-parent = <&UIC1>; | ||
265 | interrupts = <1e 4 1f 4>; | ||
266 | reg = <40000900 70>; | ||
267 | local-mac-address = [000000000000]; // Filled in by zImage | ||
268 | mal-device = <&MAL0>; | ||
269 | mal-tx-channel = <2 3>; | ||
270 | mal-rx-channel = <1>; | ||
271 | cell-index = <1>; | ||
272 | max-frame-size = <5dc>; | ||
273 | rx-fifo-size = <1000>; | ||
274 | tx-fifo-size = <800>; | ||
275 | phy-mode = "rmii"; | ||
276 | phy-map = <00000001>; | ||
277 | zmii-device = <&ZMII0>; | ||
278 | zmii-channel = <1>; | ||
279 | }; | ||
280 | |||
281 | |||
282 | GPT0: gpt@40000a00 { | ||
283 | /* FIXME */ | ||
284 | reg = <40000a00 d4>; | ||
285 | interrupt-parent = <&UIC0>; | ||
286 | interrupts = <12 4 13 4 14 4 15 4 16 4>; | ||
287 | }; | ||
288 | |||
289 | }; | ||
290 | |||
291 | PCIX0: pci@1234 { | ||
292 | device_type = "pci"; | ||
293 | /* FIXME */ | ||
294 | reg = <2 0ec00000 8 | ||
295 | 2 0ec80000 f0 | ||
296 | 2 0ec80100 fc>; | ||
297 | }; | ||
298 | }; | ||
299 | |||
300 | chosen { | ||
301 | linux,stdout-path = "/plb/opb/serial@40000200"; | ||
302 | // linux,initrd-start = <0>; /* FIXME */ | ||
303 | // linux,initrd-end = <0>; | ||
304 | // bootargs = ""; | ||
305 | }; | ||
306 | }; | ||
307 | |||
diff --git a/arch/powerpc/boot/dts/holly.dts b/arch/powerpc/boot/dts/holly.dts new file mode 100644 index 000000000000..254499b107f4 --- /dev/null +++ b/arch/powerpc/boot/dts/holly.dts | |||
@@ -0,0 +1,198 @@ | |||
1 | /* | ||
2 | * Device Tree Source for IBM Holly (PPC 750CL with TSI controller) | ||
3 | * Copyright 2007, IBM Corporation | ||
4 | * | ||
5 | * Stephen Winiecki <stevewin@us.ibm.com> | ||
6 | * Josh Boyer <jwboyer@linux.vnet.ibm.com> | ||
7 | * | ||
8 | * This file is licensed under the terms of the GNU General Public | ||
9 | * License version 2. This program is licensed "as is" without | ||
10 | * any warranty of any kind, whether express or implied. | ||
11 | * | ||
12 | * To build: | ||
13 | * dtc -I dts -O asm -o holly.S -b 0 holly.dts | ||
14 | * dtc -I dts -O dtb -o holly.dtb -b 0 holly.dts | ||
15 | */ | ||
16 | |||
17 | / { | ||
18 | model = "41K7339"; | ||
19 | compatible = "ibm,holly"; | ||
20 | #address-cells = <1>; | ||
21 | #size-cells = <1>; | ||
22 | |||
23 | cpus { | ||
24 | #address-cells = <1>; | ||
25 | #size-cells =<0>; | ||
26 | PowerPC,750CL@0 { | ||
27 | device_type = "cpu"; | ||
28 | reg = <0>; | ||
29 | d-cache-line-size = <20>; | ||
30 | i-cache-line-size = <20>; | ||
31 | d-cache-size = <8000>; | ||
32 | i-cache-size = <8000>; | ||
33 | d-cache-sets = <80>; | ||
34 | i-cache-sets = <80>; | ||
35 | timebase-frequency = <2faf080>; | ||
36 | clock-frequency = <23c34600>; | ||
37 | bus-frequency = <bebc200>; | ||
38 | 32-bit; | ||
39 | }; | ||
40 | }; | ||
41 | |||
42 | memory@0 { | ||
43 | device_type = "memory"; | ||
44 | reg = <00000000 20000000>; | ||
45 | }; | ||
46 | |||
47 | tsi109@c0000000 { | ||
48 | device_type = "tsi-bridge"; | ||
49 | compatible = "tsi-bridge"; | ||
50 | #address-cells = <1>; | ||
51 | #size-cells = <1>; | ||
52 | ranges = <00000000 c0000000 00010000>; | ||
53 | reg = <c0000000 00010000>; | ||
54 | |||
55 | i2c@7000 { | ||
56 | device_type = "i2c"; | ||
57 | compatible = "tsi-i2c"; | ||
58 | interrupt-parent = < &/tsi109@c0000000/pic@7400 >; | ||
59 | interrupts = <e 2>; | ||
60 | reg = <7000 400>; | ||
61 | }; | ||
62 | |||
63 | mdio@6000 { | ||
64 | device_type = "mdio"; | ||
65 | compatible = "tsi-ethernet"; | ||
66 | |||
67 | PHY1: ethernet-phy@6000 { | ||
68 | device_type = "ethernet-phy"; | ||
69 | compatible = "bcm54xx"; | ||
70 | reg = <6000 50>; | ||
71 | phy-id = <1>; | ||
72 | }; | ||
73 | |||
74 | PHY2: ethernet-phy@6400 { | ||
75 | device_type = "ethernet-phy"; | ||
76 | compatible = "bcm54xx"; | ||
77 | reg = <6000 50>; | ||
78 | phy-id = <2>; | ||
79 | }; | ||
80 | }; | ||
81 | |||
82 | ethernet@6200 { | ||
83 | device_type = "network"; | ||
84 | compatible = "tsi-ethernet"; | ||
85 | #address-cells = <1>; | ||
86 | #size-cells = <0>; | ||
87 | reg = <6000 200>; | ||
88 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
89 | interrupt-parent = < &/tsi109@c0000000/pic@7400 >; | ||
90 | interrupts = <10 2>; | ||
91 | phy-handle = <&PHY1>; | ||
92 | }; | ||
93 | |||
94 | ethernet@6600 { | ||
95 | device_type = "network"; | ||
96 | compatible = "tsi-ethernet"; | ||
97 | #address-cells = <1>; | ||
98 | #size-cells = <0>; | ||
99 | reg = <6400 200>; | ||
100 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
101 | interrupt-parent = < &/tsi109@c0000000/pic@7400 >; | ||
102 | interrupts = <11 2>; | ||
103 | phy-handle = <&PHY2>; | ||
104 | }; | ||
105 | |||
106 | serial@7808 { | ||
107 | device_type = "serial"; | ||
108 | compatible = "ns16550"; | ||
109 | reg = <7808 200>; | ||
110 | virtual-reg = <c0007808>; | ||
111 | clock-frequency = <3F9C6000>; | ||
112 | current-speed = <1c200>; | ||
113 | interrupt-parent = < &/tsi109@c0000000/pic@7400 >; | ||
114 | interrupts = <c 2>; | ||
115 | }; | ||
116 | |||
117 | serial@7c08 { | ||
118 | device_type = "serial"; | ||
119 | compatible = "ns16550"; | ||
120 | reg = <7c08 200>; | ||
121 | virtual-reg = <c0007c08>; | ||
122 | clock-frequency = <3F9C6000>; | ||
123 | current-speed = <1c200>; | ||
124 | interrupt-parent = < &/tsi109@c0000000/pic@7400 >; | ||
125 | interrupts = <d 2>; | ||
126 | }; | ||
127 | |||
128 | MPIC: pic@7400 { | ||
129 | device_type = "open-pic"; | ||
130 | compatible = "chrp,open-pic"; | ||
131 | interrupt-controller; | ||
132 | #interrupt-cells = <2>; | ||
133 | reg = <7400 400>; | ||
134 | big-endian; | ||
135 | }; | ||
136 | |||
137 | pci@1000 { | ||
138 | device_type = "pci"; | ||
139 | compatible = "tsi109"; | ||
140 | #interrupt-cells = <1>; | ||
141 | #size-cells = <2>; | ||
142 | #address-cells = <3>; | ||
143 | reg = <1000 1000>; | ||
144 | bus-range = <0 0>; | ||
145 | /*----------------------------------------------------+ | ||
146 | | PCI memory range. | ||
147 | | 01 denotes I/O space | ||
148 | | 02 denotes 32-bit memory space | ||
149 | +----------------------------------------------------*/ | ||
150 | ranges = <02000000 0 40000000 40000000 0 10000000 | ||
151 | 01000000 0 00000000 7e000000 0 00010000>; | ||
152 | clock-frequency = <7f28154>; | ||
153 | interrupt-parent = < &/tsi109@c0000000/pic@7400 >; | ||
154 | interrupts = <17 2>; | ||
155 | interrupt-map-mask = <f800 0 0 7>; | ||
156 | /*----------------------------------------------------+ | ||
157 | | The INTA, INTB, INTC, INTD are shared. | ||
158 | +----------------------------------------------------*/ | ||
159 | interrupt-map = < | ||
160 | 0800 0 0 1 &RT0 24 0 | ||
161 | 0800 0 0 2 &RT0 25 0 | ||
162 | 0800 0 0 3 &RT0 26 0 | ||
163 | 0800 0 0 4 &RT0 27 0 | ||
164 | |||
165 | 1000 0 0 1 &RT0 25 0 | ||
166 | 1000 0 0 2 &RT0 26 0 | ||
167 | 1000 0 0 3 &RT0 27 0 | ||
168 | 1000 0 0 4 &RT0 24 0 | ||
169 | |||
170 | 1800 0 0 1 &RT0 26 0 | ||
171 | 1800 0 0 2 &RT0 27 0 | ||
172 | 1800 0 0 3 &RT0 24 0 | ||
173 | 1800 0 0 4 &RT0 25 0 | ||
174 | |||
175 | 2000 0 0 1 &RT0 27 0 | ||
176 | 2000 0 0 2 &RT0 24 0 | ||
177 | 2000 0 0 3 &RT0 25 0 | ||
178 | 2000 0 0 4 &RT0 26 0 | ||
179 | >; | ||
180 | |||
181 | RT0: router@1180 { | ||
182 | device_type = "pic-router"; | ||
183 | interrupt-controller; | ||
184 | big-endian; | ||
185 | clock-frequency = <0>; | ||
186 | #address-cells = <0>; | ||
187 | #interrupt-cells = <2>; | ||
188 | interrupts = <17 2>; | ||
189 | interrupt-parent = < &/tsi109@c0000000/pic@7400 >; | ||
190 | }; | ||
191 | }; | ||
192 | }; | ||
193 | |||
194 | chosen { | ||
195 | linux,stdout-path = "/tsi109@c0000000/serial@7808"; | ||
196 | bootargs = "console=ttyS0,115200"; | ||
197 | }; | ||
198 | }; | ||
diff --git a/arch/powerpc/boot/dts/lite5200.dts b/arch/powerpc/boot/dts/lite5200.dts index ba54c6b40a09..e13ac6ef05a9 100644 --- a/arch/powerpc/boot/dts/lite5200.dts +++ b/arch/powerpc/boot/dts/lite5200.dts | |||
@@ -48,6 +48,7 @@ | |||
48 | 48 | ||
49 | soc5200@f0000000 { | 49 | soc5200@f0000000 { |
50 | model = "fsl,mpc5200"; | 50 | model = "fsl,mpc5200"; |
51 | compatible = "mpc5200"; | ||
51 | revision = "" // from bootloader | 52 | revision = "" // from bootloader |
52 | #interrupt-cells = <3>; | 53 | #interrupt-cells = <3>; |
53 | device_type = "soc"; | 54 | device_type = "soc"; |
@@ -166,7 +167,7 @@ | |||
166 | device_type = "mscan"; | 167 | device_type = "mscan"; |
167 | compatible = "mpc5200-mscan"; | 168 | compatible = "mpc5200-mscan"; |
168 | cell-index = <1>; | 169 | cell-index = <1>; |
169 | interrupts = <1 12 0>; | 170 | interrupts = <2 12 0>; |
170 | interrupt-parent = <500>; | 171 | interrupt-parent = <500>; |
171 | reg = <980 80>; | 172 | reg = <980 80>; |
172 | }; | 173 | }; |
@@ -178,7 +179,7 @@ | |||
178 | interrupt-parent = <500>; | 179 | interrupt-parent = <500>; |
179 | }; | 180 | }; |
180 | 181 | ||
181 | gpio-wkup@b00 { | 182 | gpio-wkup@c00 { |
182 | compatible = "mpc5200-gpio-wkup"; | 183 | compatible = "mpc5200-gpio-wkup"; |
183 | reg = <c00 40>; | 184 | reg = <c00 40>; |
184 | interrupts = <1 8 0 0 3 0>; | 185 | interrupts = <1 8 0 0 3 0>; |
@@ -317,20 +318,22 @@ | |||
317 | 318 | ||
318 | i2c@3d00 { | 319 | i2c@3d00 { |
319 | device_type = "i2c"; | 320 | device_type = "i2c"; |
320 | compatible = "mpc5200-i2c"; | 321 | compatible = "mpc5200-i2c\0fsl-i2c"; |
321 | cell-index = <0>; | 322 | cell-index = <0>; |
322 | reg = <3d00 40>; | 323 | reg = <3d00 40>; |
323 | interrupts = <2 f 0>; | 324 | interrupts = <2 f 0>; |
324 | interrupt-parent = <500>; | 325 | interrupt-parent = <500>; |
326 | fsl5200-clocking; | ||
325 | }; | 327 | }; |
326 | 328 | ||
327 | i2c@3d40 { | 329 | i2c@3d40 { |
328 | device_type = "i2c"; | 330 | device_type = "i2c"; |
329 | compatible = "mpc5200-i2c"; | 331 | compatible = "mpc5200-i2c\0fsl-i2c"; |
330 | cell-index = <1>; | 332 | cell-index = <1>; |
331 | reg = <3d40 40>; | 333 | reg = <3d40 40>; |
332 | interrupts = <2 10 0>; | 334 | interrupts = <2 10 0>; |
333 | interrupt-parent = <500>; | 335 | interrupt-parent = <500>; |
336 | fsl5200-clocking; | ||
334 | }; | 337 | }; |
335 | sram@8000 { | 338 | sram@8000 { |
336 | device_type = "sram"; | 339 | device_type = "sram"; |
diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts index 2e003081b0d3..00211b39a342 100644 --- a/arch/powerpc/boot/dts/lite5200b.dts +++ b/arch/powerpc/boot/dts/lite5200b.dts | |||
@@ -48,6 +48,7 @@ | |||
48 | 48 | ||
49 | soc5200@f0000000 { | 49 | soc5200@f0000000 { |
50 | model = "fsl,mpc5200b"; | 50 | model = "fsl,mpc5200b"; |
51 | compatible = "mpc5200"; | ||
51 | revision = ""; // from bootloader | 52 | revision = ""; // from bootloader |
52 | #interrupt-cells = <3>; | 53 | #interrupt-cells = <3>; |
53 | device_type = "soc"; | 54 | device_type = "soc"; |
@@ -166,7 +167,7 @@ | |||
166 | device_type = "mscan"; | 167 | device_type = "mscan"; |
167 | compatible = "mpc5200b-mscan\0mpc5200-mscan"; | 168 | compatible = "mpc5200b-mscan\0mpc5200-mscan"; |
168 | cell-index = <1>; | 169 | cell-index = <1>; |
169 | interrupts = <1 12 0>; | 170 | interrupts = <2 12 0>; |
170 | interrupt-parent = <500>; | 171 | interrupt-parent = <500>; |
171 | reg = <980 80>; | 172 | reg = <980 80>; |
172 | }; | 173 | }; |
@@ -178,7 +179,7 @@ | |||
178 | interrupt-parent = <500>; | 179 | interrupt-parent = <500>; |
179 | }; | 180 | }; |
180 | 181 | ||
181 | gpio-wkup@b00 { | 182 | gpio-wkup@c00 { |
182 | compatible = "mpc5200b-gpio-wkup\0mpc5200-gpio-wkup"; | 183 | compatible = "mpc5200b-gpio-wkup\0mpc5200-gpio-wkup"; |
183 | reg = <c00 40>; | 184 | reg = <c00 40>; |
184 | interrupts = <1 8 0 0 3 0>; | 185 | interrupts = <1 8 0 0 3 0>; |
@@ -322,20 +323,22 @@ | |||
322 | 323 | ||
323 | i2c@3d00 { | 324 | i2c@3d00 { |
324 | device_type = "i2c"; | 325 | device_type = "i2c"; |
325 | compatible = "mpc5200b-i2c\0mpc5200-i2c"; | 326 | compatible = "mpc5200b-i2c\0mpc5200-i2c\0fsl-i2c"; |
326 | cell-index = <0>; | 327 | cell-index = <0>; |
327 | reg = <3d00 40>; | 328 | reg = <3d00 40>; |
328 | interrupts = <2 f 0>; | 329 | interrupts = <2 f 0>; |
329 | interrupt-parent = <500>; | 330 | interrupt-parent = <500>; |
331 | fsl5200-clocking; | ||
330 | }; | 332 | }; |
331 | 333 | ||
332 | i2c@3d40 { | 334 | i2c@3d40 { |
333 | device_type = "i2c"; | 335 | device_type = "i2c"; |
334 | compatible = "mpc5200b-i2c\0mpc5200-i2c"; | 336 | compatible = "mpc5200b-i2c\0mpc5200-i2c\0fsl-i2c"; |
335 | cell-index = <1>; | 337 | cell-index = <1>; |
336 | reg = <3d40 40>; | 338 | reg = <3d40 40>; |
337 | interrupts = <2 10 0>; | 339 | interrupts = <2 10 0>; |
338 | interrupt-parent = <500>; | 340 | interrupt-parent = <500>; |
341 | fsl5200-clocking; | ||
339 | }; | 342 | }; |
340 | sram@8000 { | 343 | sram@8000 { |
341 | device_type = "sram"; | 344 | device_type = "sram"; |
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts index c798491f4cd0..93b760696010 100644 --- a/arch/powerpc/boot/dts/mpc832x_mds.dts +++ b/arch/powerpc/boot/dts/mpc832x_mds.dts | |||
@@ -306,14 +306,12 @@ | |||
306 | interrupts = <11 8>; | 306 | interrupts = <11 8>; |
307 | reg = <3>; | 307 | reg = <3>; |
308 | device_type = "ethernet-phy"; | 308 | device_type = "ethernet-phy"; |
309 | interface = <3>; //ENET_100_MII | ||
310 | }; | 309 | }; |
311 | phy4: ethernet-phy@04 { | 310 | phy4: ethernet-phy@04 { |
312 | interrupt-parent = < &ipic >; | 311 | interrupt-parent = < &ipic >; |
313 | interrupts = <12 8>; | 312 | interrupts = <12 8>; |
314 | reg = <4>; | 313 | reg = <4>; |
315 | device_type = "ethernet-phy"; | 314 | device_type = "ethernet-phy"; |
316 | interface = <3>; | ||
317 | }; | 315 | }; |
318 | }; | 316 | }; |
319 | 317 | ||
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts index b55bced1593d..be4c35784e49 100644 --- a/arch/powerpc/boot/dts/mpc832x_rdb.dts +++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts | |||
@@ -265,14 +265,12 @@ | |||
265 | interrupts = <0>; | 265 | interrupts = <0>; |
266 | reg = <0>; | 266 | reg = <0>; |
267 | device_type = "ethernet-phy"; | 267 | device_type = "ethernet-phy"; |
268 | interface = <3>; //ENET_100_MII | ||
269 | }; | 268 | }; |
270 | phy04:ethernet-phy@04 { | 269 | phy04:ethernet-phy@04 { |
271 | interrupt-parent = <&pic>; | 270 | interrupt-parent = <&pic>; |
272 | interrupts = <0>; | 271 | interrupts = <0>; |
273 | reg = <4>; | 272 | reg = <4>; |
274 | device_type = "ethernet-phy"; | 273 | device_type = "ethernet-phy"; |
275 | interface = <3>; | ||
276 | }; | 274 | }; |
277 | }; | 275 | }; |
278 | 276 | ||
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts index 7f578eb57082..38c8594df3a4 100644 --- a/arch/powerpc/boot/dts/mpc836x_mds.dts +++ b/arch/powerpc/boot/dts/mpc836x_mds.dts | |||
@@ -305,6 +305,7 @@ | |||
305 | rx-clock = <0>; | 305 | rx-clock = <0>; |
306 | tx-clock = <19>; | 306 | tx-clock = <19>; |
307 | phy-handle = < &phy0 >; | 307 | phy-handle = < &phy0 >; |
308 | phy-connection-type = "rgmii-id"; | ||
308 | pio-handle = < &pio1 >; | 309 | pio-handle = < &pio1 >; |
309 | }; | 310 | }; |
310 | 311 | ||
@@ -320,6 +321,7 @@ | |||
320 | rx-clock = <0>; | 321 | rx-clock = <0>; |
321 | tx-clock = <14>; | 322 | tx-clock = <14>; |
322 | phy-handle = < &phy1 >; | 323 | phy-handle = < &phy1 >; |
324 | phy-connection-type = "rgmii-id"; | ||
323 | pio-handle = < &pio2 >; | 325 | pio-handle = < &pio2 >; |
324 | }; | 326 | }; |
325 | 327 | ||
@@ -335,14 +337,12 @@ | |||
335 | interrupts = <11 8>; | 337 | interrupts = <11 8>; |
336 | reg = <0>; | 338 | reg = <0>; |
337 | device_type = "ethernet-phy"; | 339 | device_type = "ethernet-phy"; |
338 | interface = <6>; //ENET_1000_GMII | ||
339 | }; | 340 | }; |
340 | phy1: ethernet-phy@01 { | 341 | phy1: ethernet-phy@01 { |
341 | interrupt-parent = < &ipic >; | 342 | interrupt-parent = < &ipic >; |
342 | interrupts = <12 8>; | 343 | interrupts = <12 8>; |
343 | reg = <1>; | 344 | reg = <1>; |
344 | device_type = "ethernet-phy"; | 345 | device_type = "ethernet-phy"; |
345 | interface = <6>; | ||
346 | }; | 346 | }; |
347 | }; | 347 | }; |
348 | 348 | ||
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts index 7361b36749cb..948a3b61bd4a 100644 --- a/arch/powerpc/boot/dts/mpc8568mds.dts +++ b/arch/powerpc/boot/dts/mpc8568mds.dts | |||
@@ -288,6 +288,7 @@ | |||
288 | rx-clock = <0>; | 288 | rx-clock = <0>; |
289 | tx-clock = <19>; | 289 | tx-clock = <19>; |
290 | phy-handle = <&qe_phy0>; | 290 | phy-handle = <&qe_phy0>; |
291 | phy-connection-type = "gmii"; | ||
291 | pio-handle = <&pio1>; | 292 | pio-handle = <&pio1>; |
292 | }; | 293 | }; |
293 | 294 | ||
@@ -303,6 +304,7 @@ | |||
303 | rx-clock = <0>; | 304 | rx-clock = <0>; |
304 | tx-clock = <14>; | 305 | tx-clock = <14>; |
305 | phy-handle = <&qe_phy1>; | 306 | phy-handle = <&qe_phy1>; |
307 | phy-connection-type = "gmii"; | ||
306 | pio-handle = <&pio2>; | 308 | pio-handle = <&pio2>; |
307 | }; | 309 | }; |
308 | 310 | ||
@@ -320,28 +322,24 @@ | |||
320 | interrupts = <31 1>; | 322 | interrupts = <31 1>; |
321 | reg = <0>; | 323 | reg = <0>; |
322 | device_type = "ethernet-phy"; | 324 | device_type = "ethernet-phy"; |
323 | interface = <6>; //ENET_1000_GMII | ||
324 | }; | 325 | }; |
325 | qe_phy1: ethernet-phy@01 { | 326 | qe_phy1: ethernet-phy@01 { |
326 | interrupt-parent = <&mpic>; | 327 | interrupt-parent = <&mpic>; |
327 | interrupts = <32 1>; | 328 | interrupts = <32 1>; |
328 | reg = <1>; | 329 | reg = <1>; |
329 | device_type = "ethernet-phy"; | 330 | device_type = "ethernet-phy"; |
330 | interface = <6>; | ||
331 | }; | 331 | }; |
332 | qe_phy2: ethernet-phy@02 { | 332 | qe_phy2: ethernet-phy@02 { |
333 | interrupt-parent = <&mpic>; | 333 | interrupt-parent = <&mpic>; |
334 | interrupts = <31 1>; | 334 | interrupts = <31 1>; |
335 | reg = <2>; | 335 | reg = <2>; |
336 | device_type = "ethernet-phy"; | 336 | device_type = "ethernet-phy"; |
337 | interface = <6>; //ENET_1000_GMII | ||
338 | }; | 337 | }; |
339 | qe_phy3: ethernet-phy@03 { | 338 | qe_phy3: ethernet-phy@03 { |
340 | interrupt-parent = <&mpic>; | 339 | interrupt-parent = <&mpic>; |
341 | interrupts = <32 1>; | 340 | interrupts = <32 1>; |
342 | reg = <3>; | 341 | reg = <3>; |
343 | device_type = "ethernet-phy"; | 342 | device_type = "ethernet-phy"; |
344 | interface = <6>; //ENET_1000_GMII | ||
345 | }; | 343 | }; |
346 | }; | 344 | }; |
347 | 345 | ||