diff options
author | Scott Wood <scottwood@freescale.com> | 2007-10-08 17:08:51 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-10-11 10:14:31 -0400 |
commit | 8abc8f5f1eda7a34394c8006fe1cb4c13ffca682 (patch) | |
tree | 2fc088a89679cde38bcf7b78c70699c1e1f4cf2d /arch/powerpc/boot/dts/mpc8560ads.dts | |
parent | 52aff9f93e452b3a55be74018dc90eb0ddde0a9c (diff) |
[POWERPC] 85xx: Convert mpc8560ads to the new CPM binding.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8560ads.dts')
-rw-r--r-- | arch/powerpc/boot/dts/mpc8560ads.dts | 82 |
1 files changed, 44 insertions, 38 deletions
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts index 5577ec1f312b..6b362f8222c1 100644 --- a/arch/powerpc/boot/dts/mpc8560ads.dts +++ b/arch/powerpc/boot/dts/mpc8560ads.dts | |||
@@ -138,15 +138,31 @@ | |||
138 | device_type = "open-pic"; | 138 | device_type = "open-pic"; |
139 | }; | 139 | }; |
140 | 140 | ||
141 | cpm@e0000000 { | 141 | cpm@919c0 { |
142 | #address-cells = <1>; | 142 | #address-cells = <1>; |
143 | #size-cells = <1>; | 143 | #size-cells = <1>; |
144 | device_type = "cpm"; | 144 | compatible = "fsl,mpc8560-cpm", "fsl,cpm2"; |
145 | model = "CPM2"; | 145 | reg = <919c0 30>; |
146 | ranges = <0 0 c0000>; | 146 | ranges; |
147 | reg = <80000 40000>; | 147 | |
148 | command-proc = <919c0>; | 148 | muram@80000 { |
149 | brg-frequency = <9d5b340>; | 149 | #address-cells = <1>; |
150 | #size-cells = <1>; | ||
151 | ranges = <0 80000 10000>; | ||
152 | |||
153 | data@0 { | ||
154 | compatible = "fsl,cpm-muram-data"; | ||
155 | reg = <0 4000 9000 2000>; | ||
156 | }; | ||
157 | }; | ||
158 | |||
159 | brg@919f0 { | ||
160 | compatible = "fsl,mpc8560-brg", | ||
161 | "fsl,cpm2-brg", | ||
162 | "fsl,cpm-brg"; | ||
163 | reg = <919f0 10 915f0 10>; | ||
164 | clock-frequency = <d#165000000>; | ||
165 | }; | ||
150 | 166 | ||
151 | cpmpic: pic@90c00 { | 167 | cpmpic: pic@90c00 { |
152 | interrupt-controller; | 168 | interrupt-controller; |
@@ -155,43 +171,38 @@ | |||
155 | interrupts = <2e 2>; | 171 | interrupts = <2e 2>; |
156 | interrupt-parent = <&mpic>; | 172 | interrupt-parent = <&mpic>; |
157 | reg = <90c00 80>; | 173 | reg = <90c00 80>; |
158 | device_type = "cpm-pic"; | 174 | compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic"; |
159 | }; | 175 | }; |
160 | 176 | ||
161 | scc@91a00 { | 177 | serial@91a00 { |
162 | device_type = "serial"; | 178 | device_type = "serial"; |
163 | compatible = "cpm_uart"; | 179 | compatible = "fsl,mpc8560-scc-uart", |
164 | model = "SCC"; | 180 | "fsl,cpm2-scc-uart"; |
165 | device-id = <1>; | ||
166 | reg = <91a00 20 88000 100>; | 181 | reg = <91a00 20 88000 100>; |
167 | clock-setup = <00ffffff 0>; | 182 | fsl,cpm-brg = <1>; |
168 | rx-clock = <1>; | 183 | fsl,cpm-command = <00800000>; |
169 | tx-clock = <1>; | ||
170 | current-speed = <1c200>; | 184 | current-speed = <1c200>; |
171 | interrupts = <28 8>; | 185 | interrupts = <28 8>; |
172 | interrupt-parent = <&cpmpic>; | 186 | interrupt-parent = <&cpmpic>; |
173 | }; | 187 | }; |
174 | 188 | ||
175 | scc@91a20 { | 189 | serial@91a20 { |
176 | device_type = "serial"; | 190 | device_type = "serial"; |
177 | compatible = "cpm_uart"; | 191 | compatible = "fsl,mpc8560-scc-uart", |
178 | model = "SCC"; | 192 | "fsl,cpm2-scc-uart"; |
179 | device-id = <2>; | ||
180 | reg = <91a20 20 88100 100>; | 193 | reg = <91a20 20 88100 100>; |
181 | clock-setup = <ff00ffff 90000>; | 194 | fsl,cpm-brg = <2>; |
182 | rx-clock = <2>; | 195 | fsl,cpm-command = <04a00000>; |
183 | tx-clock = <2>; | ||
184 | current-speed = <1c200>; | 196 | current-speed = <1c200>; |
185 | interrupts = <29 8>; | 197 | interrupts = <29 8>; |
186 | interrupt-parent = <&cpmpic>; | 198 | interrupt-parent = <&cpmpic>; |
187 | }; | 199 | }; |
188 | 200 | ||
189 | fcc@91320 { | 201 | ethernet@91320 { |
190 | device_type = "network"; | 202 | device_type = "network"; |
191 | compatible = "fs_enet"; | 203 | compatible = "fsl,mpc8560-fcc-enet", |
192 | model = "FCC"; | 204 | "fsl,cpm2-fcc-enet"; |
193 | device-id = <2>; | 205 | reg = <91320 20 88500 100 913b0 1>; |
194 | reg = <91320 20 88500 100 913a0 30>; | ||
195 | /* | 206 | /* |
196 | * mac-address is deprecated and will be removed | 207 | * mac-address is deprecated and will be removed |
197 | * in 2.6.25. Only recent versions of | 208 | * in 2.6.25. Only recent versions of |
@@ -199,20 +210,17 @@ | |||
199 | */ | 210 | */ |
200 | mac-address = [ 00 00 00 00 00 00 ]; | 211 | mac-address = [ 00 00 00 00 00 00 ]; |
201 | local-mac-address = [ 00 00 00 00 00 00 ]; | 212 | local-mac-address = [ 00 00 00 00 00 00 ]; |
202 | clock-setup = <ff00ffff 250000>; | 213 | fsl,cpm-command = <16200300>; |
203 | rx-clock = <15>; | ||
204 | tx-clock = <16>; | ||
205 | interrupts = <21 8>; | 214 | interrupts = <21 8>; |
206 | interrupt-parent = <&cpmpic>; | 215 | interrupt-parent = <&cpmpic>; |
207 | phy-handle = <&phy2>; | 216 | phy-handle = <&phy2>; |
208 | }; | 217 | }; |
209 | 218 | ||
210 | fcc@91340 { | 219 | ethernet@91340 { |
211 | device_type = "network"; | 220 | device_type = "network"; |
212 | compatible = "fs_enet"; | 221 | compatible = "fsl,mpc8560-fcc-enet", |
213 | model = "FCC"; | 222 | "fsl,cpm2-fcc-enet"; |
214 | device-id = <3>; | 223 | reg = <91340 20 88600 100 913d0 1>; |
215 | reg = <91340 20 88600 100 913d0 30>; | ||
216 | /* | 224 | /* |
217 | * mac-address is deprecated and will be removed | 225 | * mac-address is deprecated and will be removed |
218 | * in 2.6.25. Only recent versions of | 226 | * in 2.6.25. Only recent versions of |
@@ -220,9 +228,7 @@ | |||
220 | */ | 228 | */ |
221 | mac-address = [ 00 00 00 00 00 00 ]; | 229 | mac-address = [ 00 00 00 00 00 00 ]; |
222 | local-mac-address = [ 00 00 00 00 00 00 ]; | 230 | local-mac-address = [ 00 00 00 00 00 00 ]; |
223 | clock-setup = <ffff00ff 3700>; | 231 | fsl,cpm-command = <1a400300>; |
224 | rx-clock = <17>; | ||
225 | tx-clock = <18>; | ||
226 | interrupts = <22 8>; | 232 | interrupts = <22 8>; |
227 | interrupt-parent = <&cpmpic>; | 233 | interrupt-parent = <&cpmpic>; |
228 | phy-handle = <&phy3>; | 234 | phy-handle = <&phy3>; |