diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 16:05:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 16:05:14 -0500 |
commit | 5c56f466835d20fc4f7119063a8c029f7170a317 (patch) | |
tree | cfa8afcea4defb59de32c501245bae16d0fdc5d0 /arch/powerpc/boot/dts/mpc8560ads.dts | |
parent | dd397a6d1ae125686d97a20f983778c331093206 (diff) | |
parent | c2944612cf30aece4526f23e96e1d234a1870ed6 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (34 commits)
[POWERPC] 86xx: Cleaned up platform dts files
[POWERPC] 85xx: Renamed MPC8568 MDS board code to match other boards
[POWERPC] 85xx: Cleaning up machine probing
[POWERPC] QE: clean up ucc_slow.c and ucc_fast.c
[POWERPC] 85xx: Cleaned up platform dts files
[POWERPC] 83xx: Renamed MPC8323 MDS dts and defconfig to match other boards
[POWERPC] 83xx: Updated and renamed MPC8360PB to MPC836x MDS
[POWERPC] 83xx: Use of_platform_bus_probe to setup QE devices
[POWERPC] 83xx: use default value of loops_per_jiffy
[POWERPC] 83xx: Remove obsolete setting of ROOT_DEV.
[POWERPC] 83xx: Cleaning up machine probing and board initcalls
[POWERPC] Dispose irq mapping when done in mpc52xx_serial.c
[POWERPC] 86xx: Add missing of_node_put() in mpc86xx_hpcn_init_irq().
[POWERPC] 8[56]xx: Remove obsolete setting of ROOT_DEV for 85xx and 86xx platforms.
[POWERPC] pseries: Enabling auto poweron after power is restored.
[POWERPC] use winbond libata instead of ide driver for pseries CD drives
[POWERPC] powerpc: remove references to the obsolete linux,platform property
[POWERPC] add of_get_mac_address and update fsl_soc.c to use it
[POWERPC] 83xx: Cleaned up 83xx platform dts files
[POWERPC] Fix bug with early ioremap and 64k pages
...
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8560ads.dts')
-rw-r--r-- | arch/powerpc/boot/dts/mpc8560ads.dts | 158 |
1 files changed, 72 insertions, 86 deletions
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts index 119bd5d3a834..10502638b0e9 100644 --- a/arch/powerpc/boot/dts/mpc8560ads.dts +++ b/arch/powerpc/boot/dts/mpc8560ads.dts | |||
@@ -12,16 +12,14 @@ | |||
12 | 12 | ||
13 | / { | 13 | / { |
14 | model = "MPC8560ADS"; | 14 | model = "MPC8560ADS"; |
15 | compatible = "MPC85xxADS"; | 15 | compatible = "MPC8560ADS", "MPC85xxADS"; |
16 | #address-cells = <1>; | 16 | #address-cells = <1>; |
17 | #size-cells = <1>; | 17 | #size-cells = <1>; |
18 | linux,phandle = <100>; | ||
19 | 18 | ||
20 | cpus { | 19 | cpus { |
21 | #cpus = <1>; | 20 | #cpus = <1>; |
22 | #address-cells = <1>; | 21 | #address-cells = <1>; |
23 | #size-cells = <0>; | 22 | #size-cells = <0>; |
24 | linux,phandle = <200>; | ||
25 | 23 | ||
26 | PowerPC,8560@0 { | 24 | PowerPC,8560@0 { |
27 | device_type = "cpu"; | 25 | device_type = "cpu"; |
@@ -34,14 +32,11 @@ | |||
34 | bus-frequency = <13ab6680>; | 32 | bus-frequency = <13ab6680>; |
35 | clock-frequency = <312c8040>; | 33 | clock-frequency = <312c8040>; |
36 | 32-bit; | 34 | 32-bit; |
37 | linux,phandle = <201>; | ||
38 | linux,boot-cpu; | ||
39 | }; | 35 | }; |
40 | }; | 36 | }; |
41 | 37 | ||
42 | memory { | 38 | memory { |
43 | device_type = "memory"; | 39 | device_type = "memory"; |
44 | linux,phandle = <300>; | ||
45 | reg = <00000000 10000000>; | 40 | reg = <00000000 10000000>; |
46 | }; | 41 | }; |
47 | 42 | ||
@@ -58,33 +53,28 @@ | |||
58 | device_type = "mdio"; | 53 | device_type = "mdio"; |
59 | compatible = "gianfar"; | 54 | compatible = "gianfar"; |
60 | reg = <24520 20>; | 55 | reg = <24520 20>; |
61 | linux,phandle = <24520>; | ||
62 | #address-cells = <1>; | 56 | #address-cells = <1>; |
63 | #size-cells = <0>; | 57 | #size-cells = <0>; |
64 | ethernet-phy@0 { | 58 | phy0: ethernet-phy@0 { |
65 | linux,phandle = <2452000>; | 59 | interrupt-parent = <&mpic>; |
66 | interrupt-parent = <40000>; | ||
67 | interrupts = <35 1>; | 60 | interrupts = <35 1>; |
68 | reg = <0>; | 61 | reg = <0>; |
69 | device_type = "ethernet-phy"; | 62 | device_type = "ethernet-phy"; |
70 | }; | 63 | }; |
71 | ethernet-phy@1 { | 64 | phy1: ethernet-phy@1 { |
72 | linux,phandle = <2452001>; | 65 | interrupt-parent = <&mpic>; |
73 | interrupt-parent = <40000>; | ||
74 | interrupts = <35 1>; | 66 | interrupts = <35 1>; |
75 | reg = <1>; | 67 | reg = <1>; |
76 | device_type = "ethernet-phy"; | 68 | device_type = "ethernet-phy"; |
77 | }; | 69 | }; |
78 | ethernet-phy@2 { | 70 | phy2: ethernet-phy@2 { |
79 | linux,phandle = <2452002>; | 71 | interrupt-parent = <&mpic>; |
80 | interrupt-parent = <40000>; | ||
81 | interrupts = <37 1>; | 72 | interrupts = <37 1>; |
82 | reg = <2>; | 73 | reg = <2>; |
83 | device_type = "ethernet-phy"; | 74 | device_type = "ethernet-phy"; |
84 | }; | 75 | }; |
85 | ethernet-phy@3 { | 76 | phy3: ethernet-phy@3 { |
86 | linux,phandle = <2452003>; | 77 | interrupt-parent = <&mpic>; |
87 | interrupt-parent = <40000>; | ||
88 | interrupts = <37 1>; | 78 | interrupts = <37 1>; |
89 | reg = <3>; | 79 | reg = <3>; |
90 | device_type = "ethernet-phy"; | 80 | device_type = "ethernet-phy"; |
@@ -98,8 +88,8 @@ | |||
98 | reg = <24000 1000>; | 88 | reg = <24000 1000>; |
99 | address = [ 00 00 0C 00 00 FD ]; | 89 | address = [ 00 00 0C 00 00 FD ]; |
100 | interrupts = <d 2 e 2 12 2>; | 90 | interrupts = <d 2 e 2 12 2>; |
101 | interrupt-parent = <40000>; | 91 | interrupt-parent = <&mpic>; |
102 | phy-handle = <2452000>; | 92 | phy-handle = <&phy0>; |
103 | }; | 93 | }; |
104 | 94 | ||
105 | ethernet@25000 { | 95 | ethernet@25000 { |
@@ -111,12 +101,11 @@ | |||
111 | reg = <25000 1000>; | 101 | reg = <25000 1000>; |
112 | address = [ 00 00 0C 00 01 FD ]; | 102 | address = [ 00 00 0C 00 01 FD ]; |
113 | interrupts = <13 2 14 2 18 2>; | 103 | interrupts = <13 2 14 2 18 2>; |
114 | interrupt-parent = <40000>; | 104 | interrupt-parent = <&mpic>; |
115 | phy-handle = <2452001>; | 105 | phy-handle = <&phy1>; |
116 | }; | 106 | }; |
117 | 107 | ||
118 | pci@8000 { | 108 | pci@8000 { |
119 | linux,phandle = <8000>; | ||
120 | #interrupt-cells = <1>; | 109 | #interrupt-cells = <1>; |
121 | #size-cells = <2>; | 110 | #size-cells = <2>; |
122 | #address-cells = <3>; | 111 | #address-cells = <3>; |
@@ -128,96 +117,94 @@ | |||
128 | interrupt-map = < | 117 | interrupt-map = < |
129 | 118 | ||
130 | /* IDSEL 0x2 */ | 119 | /* IDSEL 0x2 */ |
131 | 1000 0 0 1 40000 31 1 | 120 | 1000 0 0 1 &mpic 31 1 |
132 | 1000 0 0 2 40000 32 1 | 121 | 1000 0 0 2 &mpic 32 1 |
133 | 1000 0 0 3 40000 33 1 | 122 | 1000 0 0 3 &mpic 33 1 |
134 | 1000 0 0 4 40000 34 1 | 123 | 1000 0 0 4 &mpic 34 1 |
135 | 124 | ||
136 | /* IDSEL 0x3 */ | 125 | /* IDSEL 0x3 */ |
137 | 1800 0 0 1 40000 34 1 | 126 | 1800 0 0 1 &mpic 34 1 |
138 | 1800 0 0 2 40000 31 1 | 127 | 1800 0 0 2 &mpic 31 1 |
139 | 1800 0 0 3 40000 32 1 | 128 | 1800 0 0 3 &mpic 32 1 |
140 | 1800 0 0 4 40000 33 1 | 129 | 1800 0 0 4 &mpic 33 1 |
141 | 130 | ||
142 | /* IDSEL 0x4 */ | 131 | /* IDSEL 0x4 */ |
143 | 2000 0 0 1 40000 33 1 | 132 | 2000 0 0 1 &mpic 33 1 |
144 | 2000 0 0 2 40000 34 1 | 133 | 2000 0 0 2 &mpic 34 1 |
145 | 2000 0 0 3 40000 31 1 | 134 | 2000 0 0 3 &mpic 31 1 |
146 | 2000 0 0 4 40000 32 1 | 135 | 2000 0 0 4 &mpic 32 1 |
147 | 136 | ||
148 | /* IDSEL 0x5 */ | 137 | /* IDSEL 0x5 */ |
149 | 2800 0 0 1 40000 32 1 | 138 | 2800 0 0 1 &mpic 32 1 |
150 | 2800 0 0 2 40000 33 1 | 139 | 2800 0 0 2 &mpic 33 1 |
151 | 2800 0 0 3 40000 34 1 | 140 | 2800 0 0 3 &mpic 34 1 |
152 | 2800 0 0 4 40000 31 1 | 141 | 2800 0 0 4 &mpic 31 1 |
153 | 142 | ||
154 | /* IDSEL 12 */ | 143 | /* IDSEL 12 */ |
155 | 6000 0 0 1 40000 31 1 | 144 | 6000 0 0 1 &mpic 31 1 |
156 | 6000 0 0 2 40000 32 1 | 145 | 6000 0 0 2 &mpic 32 1 |
157 | 6000 0 0 3 40000 33 1 | 146 | 6000 0 0 3 &mpic 33 1 |
158 | 6000 0 0 4 40000 34 1 | 147 | 6000 0 0 4 &mpic 34 1 |
159 | 148 | ||
160 | /* IDSEL 13 */ | 149 | /* IDSEL 13 */ |
161 | 6800 0 0 1 40000 34 1 | 150 | 6800 0 0 1 &mpic 34 1 |
162 | 6800 0 0 2 40000 31 1 | 151 | 6800 0 0 2 &mpic 31 1 |
163 | 6800 0 0 3 40000 32 1 | 152 | 6800 0 0 3 &mpic 32 1 |
164 | 6800 0 0 4 40000 33 1 | 153 | 6800 0 0 4 &mpic 33 1 |
165 | 154 | ||
166 | /* IDSEL 14*/ | 155 | /* IDSEL 14*/ |
167 | 7000 0 0 1 40000 33 1 | 156 | 7000 0 0 1 &mpic 33 1 |
168 | 7000 0 0 2 40000 34 1 | 157 | 7000 0 0 2 &mpic 34 1 |
169 | 7000 0 0 3 40000 31 1 | 158 | 7000 0 0 3 &mpic 31 1 |
170 | 7000 0 0 4 40000 32 1 | 159 | 7000 0 0 4 &mpic 32 1 |
171 | 160 | ||
172 | /* IDSEL 15 */ | 161 | /* IDSEL 15 */ |
173 | 7800 0 0 1 40000 32 1 | 162 | 7800 0 0 1 &mpic 32 1 |
174 | 7800 0 0 2 40000 33 1 | 163 | 7800 0 0 2 &mpic 33 1 |
175 | 7800 0 0 3 40000 34 1 | 164 | 7800 0 0 3 &mpic 34 1 |
176 | 7800 0 0 4 40000 31 1 | 165 | 7800 0 0 4 &mpic 31 1 |
177 | 166 | ||
178 | /* IDSEL 18 */ | 167 | /* IDSEL 18 */ |
179 | 9000 0 0 1 40000 31 1 | 168 | 9000 0 0 1 &mpic 31 1 |
180 | 9000 0 0 2 40000 32 1 | 169 | 9000 0 0 2 &mpic 32 1 |
181 | 9000 0 0 3 40000 33 1 | 170 | 9000 0 0 3 &mpic 33 1 |
182 | 9000 0 0 4 40000 34 1 | 171 | 9000 0 0 4 &mpic 34 1 |
183 | 172 | ||
184 | /* IDSEL 19 */ | 173 | /* IDSEL 19 */ |
185 | 9800 0 0 1 40000 34 1 | 174 | 9800 0 0 1 &mpic 34 1 |
186 | 9800 0 0 2 40000 31 1 | 175 | 9800 0 0 2 &mpic 31 1 |
187 | 9800 0 0 3 40000 32 1 | 176 | 9800 0 0 3 &mpic 32 1 |
188 | 9800 0 0 4 40000 33 1 | 177 | 9800 0 0 4 &mpic 33 1 |
189 | 178 | ||
190 | /* IDSEL 20 */ | 179 | /* IDSEL 20 */ |
191 | a000 0 0 1 40000 33 1 | 180 | a000 0 0 1 &mpic 33 1 |
192 | a000 0 0 2 40000 34 1 | 181 | a000 0 0 2 &mpic 34 1 |
193 | a000 0 0 3 40000 31 1 | 182 | a000 0 0 3 &mpic 31 1 |
194 | a000 0 0 4 40000 32 1 | 183 | a000 0 0 4 &mpic 32 1 |
195 | 184 | ||
196 | /* IDSEL 21 */ | 185 | /* IDSEL 21 */ |
197 | a800 0 0 1 40000 32 1 | 186 | a800 0 0 1 &mpic 32 1 |
198 | a800 0 0 2 40000 33 1 | 187 | a800 0 0 2 &mpic 33 1 |
199 | a800 0 0 3 40000 34 1 | 188 | a800 0 0 3 &mpic 34 1 |
200 | a800 0 0 4 40000 31 1>; | 189 | a800 0 0 4 &mpic 31 1>; |
201 | 190 | ||
202 | interrupt-parent = <40000>; | 191 | interrupt-parent = <&mpic>; |
203 | interrupts = <8 0>; | 192 | interrupts = <8 0>; |
204 | bus-range = <0 0>; | 193 | bus-range = <0 0>; |
205 | ranges = <02000000 0 80000000 80000000 0 20000000 | 194 | ranges = <02000000 0 80000000 80000000 0 20000000 |
206 | 01000000 0 00000000 e2000000 0 01000000>; | 195 | 01000000 0 00000000 e2000000 0 01000000>; |
207 | }; | 196 | }; |
208 | 197 | ||
209 | pic@40000 { | 198 | mpic: pic@40000 { |
210 | linux,phandle = <40000>; | ||
211 | interrupt-controller; | 199 | interrupt-controller; |
212 | #address-cells = <0>; | 200 | #address-cells = <0>; |
213 | #interrupt-cells = <2>; | 201 | #interrupt-cells = <2>; |
214 | reg = <40000 20100>; | 202 | reg = <40000 40000>; |
215 | built-in; | 203 | built-in; |
216 | device_type = "open-pic"; | 204 | device_type = "open-pic"; |
217 | }; | 205 | }; |
218 | 206 | ||
219 | cpm@e0000000 { | 207 | cpm@e0000000 { |
220 | linux,phandle = <e0000000>; | ||
221 | #address-cells = <1>; | 208 | #address-cells = <1>; |
222 | #size-cells = <1>; | 209 | #size-cells = <1>; |
223 | #interrupt-cells = <2>; | 210 | #interrupt-cells = <2>; |
@@ -228,13 +215,12 @@ | |||
228 | command-proc = <919c0>; | 215 | command-proc = <919c0>; |
229 | brg-frequency = <9d5b340>; | 216 | brg-frequency = <9d5b340>; |
230 | 217 | ||
231 | pic@90c00 { | 218 | cpmpic: pic@90c00 { |
232 | linux,phandle = <90c00>; | ||
233 | interrupt-controller; | 219 | interrupt-controller; |
234 | #address-cells = <0>; | 220 | #address-cells = <0>; |
235 | #interrupt-cells = <2>; | 221 | #interrupt-cells = <2>; |
236 | interrupts = <1e 0>; | 222 | interrupts = <1e 0>; |
237 | interrupt-parent = <40000>; | 223 | interrupt-parent = <&mpic>; |
238 | reg = <90c00 80>; | 224 | reg = <90c00 80>; |
239 | built-in; | 225 | built-in; |
240 | device_type = "cpm-pic"; | 226 | device_type = "cpm-pic"; |
@@ -251,7 +237,7 @@ | |||
251 | tx-clock = <1>; | 237 | tx-clock = <1>; |
252 | current-speed = <1c200>; | 238 | current-speed = <1c200>; |
253 | interrupts = <28 8>; | 239 | interrupts = <28 8>; |
254 | interrupt-parent = <90c00>; | 240 | interrupt-parent = <&cpmpic>; |
255 | }; | 241 | }; |
256 | 242 | ||
257 | scc@91a20 { | 243 | scc@91a20 { |
@@ -265,7 +251,7 @@ | |||
265 | tx-clock = <2>; | 251 | tx-clock = <2>; |
266 | current-speed = <1c200>; | 252 | current-speed = <1c200>; |
267 | interrupts = <29 8>; | 253 | interrupts = <29 8>; |
268 | interrupt-parent = <90c00>; | 254 | interrupt-parent = <&cpmpic>; |
269 | }; | 255 | }; |
270 | 256 | ||
271 | fcc@91320 { | 257 | fcc@91320 { |
@@ -279,8 +265,8 @@ | |||
279 | rx-clock = <15>; | 265 | rx-clock = <15>; |
280 | tx-clock = <16>; | 266 | tx-clock = <16>; |
281 | interrupts = <21 8>; | 267 | interrupts = <21 8>; |
282 | interrupt-parent = <90c00>; | 268 | interrupt-parent = <&cpmpic>; |
283 | phy-handle = <2452002>; | 269 | phy-handle = <&phy2>; |
284 | }; | 270 | }; |
285 | 271 | ||
286 | fcc@91340 { | 272 | fcc@91340 { |
@@ -294,8 +280,8 @@ | |||
294 | rx-clock = <17>; | 280 | rx-clock = <17>; |
295 | tx-clock = <18>; | 281 | tx-clock = <18>; |
296 | interrupts = <22 8>; | 282 | interrupts = <22 8>; |
297 | interrupt-parent = <90c00>; | 283 | interrupt-parent = <&cpmpic>; |
298 | phy-handle = <2452003>; | 284 | phy-handle = <&phy3>; |
299 | }; | 285 | }; |
300 | }; | 286 | }; |
301 | }; | 287 | }; |