diff options
Diffstat (limited to 'arch/powerpc/boot')
41 files changed, 698 insertions, 182 deletions
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 88d30dbed7b7..19f83c8f219d 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
@@ -282,7 +282,8 @@ image-y += $(subst ",,$(CONFIG_EXTRA_TARGETS)) | |||
282 | initrd- := $(patsubst zImage%, zImage.initrd%, $(image-n) $(image-)) | 282 | initrd- := $(patsubst zImage%, zImage.initrd%, $(image-n) $(image-)) |
283 | initrd-y := $(patsubst zImage%, zImage.initrd%, \ | 283 | initrd-y := $(patsubst zImage%, zImage.initrd%, \ |
284 | $(patsubst dtbImage%, dtbImage.initrd%, \ | 284 | $(patsubst dtbImage%, dtbImage.initrd%, \ |
285 | $(patsubst treeImage%, treeImage.initrd%, $(image-y)))) | 285 | $(patsubst simpleImage%, simpleImage.initrd%, \ |
286 | $(patsubst treeImage%, treeImage.initrd%, $(image-y))))) | ||
286 | initrd-y := $(filter-out $(image-y), $(initrd-y)) | 287 | initrd-y := $(filter-out $(image-y), $(initrd-y)) |
287 | targets += $(image-y) $(initrd-y) | 288 | targets += $(image-y) $(initrd-y) |
288 | 289 | ||
diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts index f9fe03252150..79fe412c11c9 100644 --- a/arch/powerpc/boot/dts/canyonlands.dts +++ b/arch/powerpc/boot/dts/canyonlands.dts | |||
@@ -266,7 +266,7 @@ | |||
266 | 266 | ||
267 | EMAC0: ethernet@ef600e00 { | 267 | EMAC0: ethernet@ef600e00 { |
268 | device_type = "network"; | 268 | device_type = "network"; |
269 | compatible = "ibm,emac-460ex", "ibm,emac4"; | 269 | compatible = "ibm,emac-460ex", "ibm,emac4sync"; |
270 | interrupt-parent = <&EMAC0>; | 270 | interrupt-parent = <&EMAC0>; |
271 | interrupts = <0x0 0x1>; | 271 | interrupts = <0x0 0x1>; |
272 | #interrupt-cells = <1>; | 272 | #interrupt-cells = <1>; |
@@ -274,7 +274,7 @@ | |||
274 | #size-cells = <0>; | 274 | #size-cells = <0>; |
275 | interrupt-map = </*Status*/ 0x0 &UIC2 0x10 0x4 | 275 | interrupt-map = </*Status*/ 0x0 &UIC2 0x10 0x4 |
276 | /*Wake*/ 0x1 &UIC2 0x14 0x4>; | 276 | /*Wake*/ 0x1 &UIC2 0x14 0x4>; |
277 | reg = <0xef600e00 0x00000070>; | 277 | reg = <0xef600e00 0x000000c4>; |
278 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ | 278 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ |
279 | mal-device = <&MAL0>; | 279 | mal-device = <&MAL0>; |
280 | mal-tx-channel = <0>; | 280 | mal-tx-channel = <0>; |
@@ -295,7 +295,7 @@ | |||
295 | 295 | ||
296 | EMAC1: ethernet@ef600f00 { | 296 | EMAC1: ethernet@ef600f00 { |
297 | device_type = "network"; | 297 | device_type = "network"; |
298 | compatible = "ibm,emac-460ex", "ibm,emac4"; | 298 | compatible = "ibm,emac-460ex", "ibm,emac4sync"; |
299 | interrupt-parent = <&EMAC1>; | 299 | interrupt-parent = <&EMAC1>; |
300 | interrupts = <0x0 0x1>; | 300 | interrupts = <0x0 0x1>; |
301 | #interrupt-cells = <1>; | 301 | #interrupt-cells = <1>; |
@@ -303,7 +303,7 @@ | |||
303 | #size-cells = <0>; | 303 | #size-cells = <0>; |
304 | interrupt-map = </*Status*/ 0x0 &UIC2 0x11 0x4 | 304 | interrupt-map = </*Status*/ 0x0 &UIC2 0x11 0x4 |
305 | /*Wake*/ 0x1 &UIC2 0x15 0x4>; | 305 | /*Wake*/ 0x1 &UIC2 0x15 0x4>; |
306 | reg = <0xef600f00 0x00000070>; | 306 | reg = <0xef600f00 0x000000c4>; |
307 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ | 307 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ |
308 | mal-device = <&MAL0>; | 308 | mal-device = <&MAL0>; |
309 | mal-tx-channel = <1>; | 309 | mal-tx-channel = <1>; |
diff --git a/arch/powerpc/boot/dts/glacier.dts b/arch/powerpc/boot/dts/glacier.dts index 463650c5f61d..24cf0dba120c 100644 --- a/arch/powerpc/boot/dts/glacier.dts +++ b/arch/powerpc/boot/dts/glacier.dts | |||
@@ -283,7 +283,7 @@ | |||
283 | #size-cells = <0>; | 283 | #size-cells = <0>; |
284 | interrupt-map = </*Status*/ 0x0 &UIC2 0x10 0x4 | 284 | interrupt-map = </*Status*/ 0x0 &UIC2 0x10 0x4 |
285 | /*Wake*/ 0x1 &UIC2 0x14 0x4>; | 285 | /*Wake*/ 0x1 &UIC2 0x14 0x4>; |
286 | reg = <0xef600e00 0x00000070>; | 286 | reg = <0xef600e00 0x00000074>; |
287 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ | 287 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ |
288 | mal-device = <&MAL0>; | 288 | mal-device = <&MAL0>; |
289 | mal-tx-channel = <0>; | 289 | mal-tx-channel = <0>; |
@@ -312,7 +312,7 @@ | |||
312 | #size-cells = <0>; | 312 | #size-cells = <0>; |
313 | interrupt-map = </*Status*/ 0x0 &UIC2 0x11 0x4 | 313 | interrupt-map = </*Status*/ 0x0 &UIC2 0x11 0x4 |
314 | /*Wake*/ 0x1 &UIC2 0x15 0x4>; | 314 | /*Wake*/ 0x1 &UIC2 0x15 0x4>; |
315 | reg = <0xef600f00 0x00000070>; | 315 | reg = <0xef600f00 0x00000074>; |
316 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ | 316 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ |
317 | mal-device = <&MAL0>; | 317 | mal-device = <&MAL0>; |
318 | mal-tx-channel = <1>; | 318 | mal-tx-channel = <1>; |
@@ -342,7 +342,7 @@ | |||
342 | #size-cells = <0>; | 342 | #size-cells = <0>; |
343 | interrupt-map = </*Status*/ 0x0 &UIC2 0x12 0x4 | 343 | interrupt-map = </*Status*/ 0x0 &UIC2 0x12 0x4 |
344 | /*Wake*/ 0x1 &UIC2 0x16 0x4>; | 344 | /*Wake*/ 0x1 &UIC2 0x16 0x4>; |
345 | reg = <0xef601100 0x00000070>; | 345 | reg = <0xef601100 0x00000074>; |
346 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ | 346 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ |
347 | mal-device = <&MAL0>; | 347 | mal-device = <&MAL0>; |
348 | mal-tx-channel = <2>; | 348 | mal-tx-channel = <2>; |
@@ -370,7 +370,7 @@ | |||
370 | #size-cells = <0>; | 370 | #size-cells = <0>; |
371 | interrupt-map = </*Status*/ 0x0 &UIC2 0x13 0x4 | 371 | interrupt-map = </*Status*/ 0x0 &UIC2 0x13 0x4 |
372 | /*Wake*/ 0x1 &UIC2 0x17 0x4>; | 372 | /*Wake*/ 0x1 &UIC2 0x17 0x4>; |
373 | reg = <0xef601200 0x00000070>; | 373 | reg = <0xef601200 0x00000074>; |
374 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ | 374 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ |
375 | mal-device = <&MAL0>; | 375 | mal-device = <&MAL0>; |
376 | mal-tx-channel = <3>; | 376 | mal-tx-channel = <3>; |
diff --git a/arch/powerpc/boot/dts/haleakala.dts b/arch/powerpc/boot/dts/haleakala.dts index 2c2fceaabbcd..513bc43a71af 100644 --- a/arch/powerpc/boot/dts/haleakala.dts +++ b/arch/powerpc/boot/dts/haleakala.dts | |||
@@ -206,7 +206,7 @@ | |||
206 | EMAC0: ethernet@ef600900 { | 206 | EMAC0: ethernet@ef600900 { |
207 | linux,network-index = <0x0>; | 207 | linux,network-index = <0x0>; |
208 | device_type = "network"; | 208 | device_type = "network"; |
209 | compatible = "ibm,emac-405exr", "ibm,emac4"; | 209 | compatible = "ibm,emac-405exr", "ibm,emac4sync"; |
210 | interrupt-parent = <&EMAC0>; | 210 | interrupt-parent = <&EMAC0>; |
211 | interrupts = <0x0 0x1>; | 211 | interrupts = <0x0 0x1>; |
212 | #interrupt-cells = <1>; | 212 | #interrupt-cells = <1>; |
@@ -214,7 +214,7 @@ | |||
214 | #size-cells = <0>; | 214 | #size-cells = <0>; |
215 | interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4 | 215 | interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4 |
216 | /*Wake*/ 0x1 &UIC1 0x1d 0x4>; | 216 | /*Wake*/ 0x1 &UIC1 0x1d 0x4>; |
217 | reg = <0xef600900 0x00000070>; | 217 | reg = <0xef600900 0x000000c4>; |
218 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ | 218 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ |
219 | mal-device = <&MAL0>; | 219 | mal-device = <&MAL0>; |
220 | mal-tx-channel = <0>; | 220 | mal-tx-channel = <0>; |
diff --git a/arch/powerpc/boot/dts/katmai.dts b/arch/powerpc/boot/dts/katmai.dts index b94bf61b9bcc..077819bc3cbd 100644 --- a/arch/powerpc/boot/dts/katmai.dts +++ b/arch/powerpc/boot/dts/katmai.dts | |||
@@ -208,7 +208,7 @@ | |||
208 | compatible = "ibm,emac-440spe", "ibm,emac4"; | 208 | compatible = "ibm,emac-440spe", "ibm,emac4"; |
209 | interrupt-parent = <&UIC1>; | 209 | interrupt-parent = <&UIC1>; |
210 | interrupts = <0x1c 0x4 0x1d 0x4>; | 210 | interrupts = <0x1c 0x4 0x1d 0x4>; |
211 | reg = <0x10000800 0x00000070>; | 211 | reg = <0x10000800 0x00000074>; |
212 | local-mac-address = [000000000000]; | 212 | local-mac-address = [000000000000]; |
213 | mal-device = <&MAL0>; | 213 | mal-device = <&MAL0>; |
214 | mal-tx-channel = <0>; | 214 | mal-tx-channel = <0>; |
diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts index 3ed6a8fee1d5..dececc4b5ff2 100644 --- a/arch/powerpc/boot/dts/kilauea.dts +++ b/arch/powerpc/boot/dts/kilauea.dts | |||
@@ -207,7 +207,7 @@ | |||
207 | EMAC0: ethernet@ef600900 { | 207 | EMAC0: ethernet@ef600900 { |
208 | linux,network-index = <0x0>; | 208 | linux,network-index = <0x0>; |
209 | device_type = "network"; | 209 | device_type = "network"; |
210 | compatible = "ibm,emac-405ex", "ibm,emac4"; | 210 | compatible = "ibm,emac-405ex", "ibm,emac4sync"; |
211 | interrupt-parent = <&EMAC0>; | 211 | interrupt-parent = <&EMAC0>; |
212 | interrupts = <0x0 0x1>; | 212 | interrupts = <0x0 0x1>; |
213 | #interrupt-cells = <1>; | 213 | #interrupt-cells = <1>; |
@@ -215,7 +215,7 @@ | |||
215 | #size-cells = <0>; | 215 | #size-cells = <0>; |
216 | interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4 | 216 | interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4 |
217 | /*Wake*/ 0x1 &UIC1 0x1d 0x4>; | 217 | /*Wake*/ 0x1 &UIC1 0x1d 0x4>; |
218 | reg = <0xef600900 0x00000070>; | 218 | reg = <0xef600900 0x000000c4>; |
219 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ | 219 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ |
220 | mal-device = <&MAL0>; | 220 | mal-device = <&MAL0>; |
221 | mal-tx-channel = <0>; | 221 | mal-tx-channel = <0>; |
@@ -235,7 +235,7 @@ | |||
235 | EMAC1: ethernet@ef600a00 { | 235 | EMAC1: ethernet@ef600a00 { |
236 | linux,network-index = <0x1>; | 236 | linux,network-index = <0x1>; |
237 | device_type = "network"; | 237 | device_type = "network"; |
238 | compatible = "ibm,emac-405ex", "ibm,emac4"; | 238 | compatible = "ibm,emac-405ex", "ibm,emac4sync"; |
239 | interrupt-parent = <&EMAC1>; | 239 | interrupt-parent = <&EMAC1>; |
240 | interrupts = <0x0 0x1>; | 240 | interrupts = <0x0 0x1>; |
241 | #interrupt-cells = <1>; | 241 | #interrupt-cells = <1>; |
@@ -243,7 +243,7 @@ | |||
243 | #size-cells = <0>; | 243 | #size-cells = <0>; |
244 | interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4 | 244 | interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4 |
245 | /*Wake*/ 0x1 &UIC1 0x1f 0x4>; | 245 | /*Wake*/ 0x1 &UIC1 0x1f 0x4>; |
246 | reg = <0xef600a00 0x00000070>; | 246 | reg = <0xef600a00 0x000000c4>; |
247 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ | 247 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ |
248 | mal-device = <&MAL0>; | 248 | mal-device = <&MAL0>; |
249 | mal-tx-channel = <1>; | 249 | mal-tx-channel = <1>; |
diff --git a/arch/powerpc/boot/dts/ksi8560.dts b/arch/powerpc/boot/dts/ksi8560.dts index fd5804398417..49737589ffc8 100644 --- a/arch/powerpc/boot/dts/ksi8560.dts +++ b/arch/powerpc/boot/dts/ksi8560.dts | |||
@@ -59,7 +59,7 @@ | |||
59 | memory-controller@2000 { | 59 | memory-controller@2000 { |
60 | compatible = "fsl,8540-memory-controller"; | 60 | compatible = "fsl,8540-memory-controller"; |
61 | reg = <0x2000 0x1000>; | 61 | reg = <0x2000 0x1000>; |
62 | interrupt-parent = <&MPIC>; | 62 | interrupt-parent = <&mpic>; |
63 | interrupts = <0x12 0x2>; | 63 | interrupts = <0x12 0x2>; |
64 | }; | 64 | }; |
65 | 65 | ||
@@ -68,7 +68,7 @@ | |||
68 | reg = <0x20000 0x1000>; | 68 | reg = <0x20000 0x1000>; |
69 | cache-line-size = <0x20>; /* 32 bytes */ | 69 | cache-line-size = <0x20>; /* 32 bytes */ |
70 | cache-size = <0x40000>; /* L2, 256K */ | 70 | cache-size = <0x40000>; /* L2, 256K */ |
71 | interrupt-parent = <&MPIC>; | 71 | interrupt-parent = <&mpic>; |
72 | interrupts = <0x10 0x2>; | 72 | interrupts = <0x10 0x2>; |
73 | }; | 73 | }; |
74 | 74 | ||
@@ -79,7 +79,7 @@ | |||
79 | compatible = "fsl-i2c"; | 79 | compatible = "fsl-i2c"; |
80 | reg = <0x3000 0x100>; | 80 | reg = <0x3000 0x100>; |
81 | interrupts = <0x2b 0x2>; | 81 | interrupts = <0x2b 0x2>; |
82 | interrupt-parent = <&MPIC>; | 82 | interrupt-parent = <&mpic>; |
83 | dfsrr; | 83 | dfsrr; |
84 | }; | 84 | }; |
85 | 85 | ||
@@ -131,13 +131,13 @@ | |||
131 | reg = <0x24520 0x20>; | 131 | reg = <0x24520 0x20>; |
132 | 132 | ||
133 | PHY1: ethernet-phy@1 { | 133 | PHY1: ethernet-phy@1 { |
134 | interrupt-parent = <&MPIC>; | 134 | interrupt-parent = <&mpic>; |
135 | reg = <0x1>; | 135 | reg = <0x1>; |
136 | device_type = "ethernet-phy"; | 136 | device_type = "ethernet-phy"; |
137 | }; | 137 | }; |
138 | 138 | ||
139 | PHY2: ethernet-phy@2 { | 139 | PHY2: ethernet-phy@2 { |
140 | interrupt-parent = <&MPIC>; | 140 | interrupt-parent = <&mpic>; |
141 | reg = <0x2>; | 141 | reg = <0x2>; |
142 | device_type = "ethernet-phy"; | 142 | device_type = "ethernet-phy"; |
143 | }; | 143 | }; |
@@ -151,7 +151,7 @@ | |||
151 | /* Mac address filled in by bootwrapper */ | 151 | /* Mac address filled in by bootwrapper */ |
152 | local-mac-address = [ 00 00 00 00 00 00 ]; | 152 | local-mac-address = [ 00 00 00 00 00 00 ]; |
153 | interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>; | 153 | interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>; |
154 | interrupt-parent = <&MPIC>; | 154 | interrupt-parent = <&mpic>; |
155 | phy-handle = <&PHY1>; | 155 | phy-handle = <&PHY1>; |
156 | }; | 156 | }; |
157 | 157 | ||
@@ -163,11 +163,11 @@ | |||
163 | /* Mac address filled in by bootwrapper */ | 163 | /* Mac address filled in by bootwrapper */ |
164 | local-mac-address = [ 00 00 00 00 00 00 ]; | 164 | local-mac-address = [ 00 00 00 00 00 00 ]; |
165 | interrupts = <0x23 0x2 0x24 0x2 0x28 0x2>; | 165 | interrupts = <0x23 0x2 0x24 0x2 0x28 0x2>; |
166 | interrupt-parent = <&MPIC>; | 166 | interrupt-parent = <&mpic>; |
167 | phy-handle = <&PHY2>; | 167 | phy-handle = <&PHY2>; |
168 | }; | 168 | }; |
169 | 169 | ||
170 | MPIC: pic@40000 { | 170 | mpic: pic@40000 { |
171 | #address-cells = <0>; | 171 | #address-cells = <0>; |
172 | #interrupt-cells = <2>; | 172 | #interrupt-cells = <2>; |
173 | interrupt-controller; | 173 | interrupt-controller; |
@@ -206,7 +206,7 @@ | |||
206 | #interrupt-cells = <2>; | 206 | #interrupt-cells = <2>; |
207 | interrupt-controller; | 207 | interrupt-controller; |
208 | interrupts = <0x2e 0x2>; | 208 | interrupts = <0x2e 0x2>; |
209 | interrupt-parent = <&MPIC>; | 209 | interrupt-parent = <&mpic>; |
210 | reg = <0x90c00 0x80>; | 210 | reg = <0x90c00 0x80>; |
211 | compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic"; | 211 | compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic"; |
212 | }; | 212 | }; |
@@ -244,7 +244,7 @@ | |||
244 | fsl,mdc-pin = <25>; | 244 | fsl,mdc-pin = <25>; |
245 | 245 | ||
246 | PHY0: ethernet-phy@0 { | 246 | PHY0: ethernet-phy@0 { |
247 | interrupt-parent = <&MPIC>; | 247 | interrupt-parent = <&mpic>; |
248 | reg = <0x0>; | 248 | reg = <0x0>; |
249 | device_type = "ethernet-phy"; | 249 | device_type = "ethernet-phy"; |
250 | }; | 250 | }; |
diff --git a/arch/powerpc/boot/dts/makalu.dts b/arch/powerpc/boot/dts/makalu.dts index 1dfcd7ed199c..945508c7e7d8 100644 --- a/arch/powerpc/boot/dts/makalu.dts +++ b/arch/powerpc/boot/dts/makalu.dts | |||
@@ -207,7 +207,7 @@ | |||
207 | EMAC0: ethernet@ef600900 { | 207 | EMAC0: ethernet@ef600900 { |
208 | linux,network-index = <0x0>; | 208 | linux,network-index = <0x0>; |
209 | device_type = "network"; | 209 | device_type = "network"; |
210 | compatible = "ibm,emac-405ex", "ibm,emac4"; | 210 | compatible = "ibm,emac-405ex", "ibm,emac4sync"; |
211 | interrupt-parent = <&EMAC0>; | 211 | interrupt-parent = <&EMAC0>; |
212 | interrupts = <0x0 0x1>; | 212 | interrupts = <0x0 0x1>; |
213 | #interrupt-cells = <1>; | 213 | #interrupt-cells = <1>; |
@@ -215,7 +215,7 @@ | |||
215 | #size-cells = <0>; | 215 | #size-cells = <0>; |
216 | interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4 | 216 | interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4 |
217 | /*Wake*/ 0x1 &UIC1 0x1d 0x4>; | 217 | /*Wake*/ 0x1 &UIC1 0x1d 0x4>; |
218 | reg = <0xef600900 0x00000070>; | 218 | reg = <0xef600900 0x000000c4>; |
219 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ | 219 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ |
220 | mal-device = <&MAL0>; | 220 | mal-device = <&MAL0>; |
221 | mal-tx-channel = <0>; | 221 | mal-tx-channel = <0>; |
@@ -235,7 +235,7 @@ | |||
235 | EMAC1: ethernet@ef600a00 { | 235 | EMAC1: ethernet@ef600a00 { |
236 | linux,network-index = <0x1>; | 236 | linux,network-index = <0x1>; |
237 | device_type = "network"; | 237 | device_type = "network"; |
238 | compatible = "ibm,emac-405ex", "ibm,emac4"; | 238 | compatible = "ibm,emac-405ex", "ibm,emac4sync"; |
239 | interrupt-parent = <&EMAC1>; | 239 | interrupt-parent = <&EMAC1>; |
240 | interrupts = <0x0 0x1>; | 240 | interrupts = <0x0 0x1>; |
241 | #interrupt-cells = <1>; | 241 | #interrupt-cells = <1>; |
@@ -243,7 +243,7 @@ | |||
243 | #size-cells = <0>; | 243 | #size-cells = <0>; |
244 | interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4 | 244 | interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4 |
245 | /*Wake*/ 0x1 &UIC1 0x1f 0x4>; | 245 | /*Wake*/ 0x1 &UIC1 0x1f 0x4>; |
246 | reg = <0xef600a00 0x00000070>; | 246 | reg = <0xef600a00 0x000000c4>; |
247 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ | 247 | local-mac-address = [000000000000]; /* Filled in by U-Boot */ |
248 | mal-device = <&MAL0>; | 248 | mal-device = <&MAL0>; |
249 | mal-tx-channel = <1>; | 249 | mal-tx-channel = <1>; |
diff --git a/arch/powerpc/boot/dts/mpc8272ads.dts b/arch/powerpc/boot/dts/mpc8272ads.dts index 46e2da30c3dd..2a1929acaabd 100644 --- a/arch/powerpc/boot/dts/mpc8272ads.dts +++ b/arch/powerpc/boot/dts/mpc8272ads.dts | |||
@@ -217,6 +217,17 @@ | |||
217 | linux,network-index = <1>; | 217 | linux,network-index = <1>; |
218 | fsl,cpm-command = <0x16200300>; | 218 | fsl,cpm-command = <0x16200300>; |
219 | }; | 219 | }; |
220 | |||
221 | i2c@11860 { | ||
222 | compatible = "fsl,mpc8272-i2c", | ||
223 | "fsl,cpm2-i2c"; | ||
224 | reg = <0x11860 0x20 0x8afc 0x2>; | ||
225 | interrupts = <1 8>; | ||
226 | interrupt-parent = <&PIC>; | ||
227 | fsl,cpm-command = <0x29600000>; | ||
228 | #address-cells = <1>; | ||
229 | #size-cells = <0>; | ||
230 | }; | ||
220 | }; | 231 | }; |
221 | 232 | ||
222 | PIC: interrupt-controller@10c00 { | 233 | PIC: interrupt-controller@10c00 { |
@@ -226,22 +237,15 @@ | |||
226 | compatible = "fsl,mpc8272-pic", "fsl,cpm2-pic"; | 237 | compatible = "fsl,mpc8272-pic", "fsl,cpm2-pic"; |
227 | }; | 238 | }; |
228 | 239 | ||
229 | /* May need to remove if on a part without crypto engine */ | ||
230 | crypto@30000 { | 240 | crypto@30000 { |
231 | device_type = "crypto"; | 241 | compatible = "fsl,sec1.0"; |
232 | model = "SEC2"; | 242 | reg = <0x40000 0x13000>; |
233 | compatible = "fsl,mpc8272-talitos-sec2", | 243 | interrupts = <47 0x8>; |
234 | "fsl,talitos-sec2", | ||
235 | "fsl,talitos", | ||
236 | "talitos"; | ||
237 | reg = <0x30000 0x10000>; | ||
238 | interrupts = <11 8>; | ||
239 | interrupt-parent = <&PIC>; | 244 | interrupt-parent = <&PIC>; |
240 | num-channels = <4>; | 245 | fsl,num-channels = <4>; |
241 | channel-fifo-len = <24>; | 246 | fsl,channel-fifo-len = <24>; |
242 | exec-units-mask = <0x7e>; | 247 | fsl,exec-units-mask = <0x7e>; |
243 | /* desc mask is for rev1.x, we need runtime fixup for >=2.x */ | 248 | fsl,descriptor-types-mask = <0x1010415>; |
244 | descriptor-types-mask = <0x1010ebf>; | ||
245 | }; | 249 | }; |
246 | }; | 250 | }; |
247 | 251 | ||
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts index b2068430a06d..3664fb584026 100644 --- a/arch/powerpc/boot/dts/mpc8313erdb.dts +++ b/arch/powerpc/boot/dts/mpc8313erdb.dts | |||
@@ -254,17 +254,14 @@ | |||
254 | }; | 254 | }; |
255 | 255 | ||
256 | crypto@30000 { | 256 | crypto@30000 { |
257 | device_type = "crypto"; | 257 | compatible = "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0"; |
258 | model = "SEC2"; | 258 | reg = <0x30000 0x10000>; |
259 | compatible = "talitos"; | ||
260 | reg = <0x30000 0x7000>; | ||
261 | interrupts = <11 0x8>; | 259 | interrupts = <11 0x8>; |
262 | interrupt-parent = <&ipic>; | 260 | interrupt-parent = <&ipic>; |
263 | /* Rev. 2.2 */ | 261 | fsl,num-channels = <1>; |
264 | num-channels = <1>; | 262 | fsl,channel-fifo-len = <24>; |
265 | channel-fifo-len = <24>; | 263 | fsl,exec-units-mask = <0x4c>; |
266 | exec-units-mask = <0x0000004c>; | 264 | fsl,descriptor-types-mask = <0x0122003f>; |
267 | descriptor-types-mask = <0x0122003f>; | ||
268 | }; | 265 | }; |
269 | 266 | ||
270 | /* IPIC | 267 | /* IPIC |
diff --git a/arch/powerpc/boot/dts/mpc8315erdb.dts b/arch/powerpc/boot/dts/mpc8315erdb.dts index a40e8064d429..f704513fb930 100644 --- a/arch/powerpc/boot/dts/mpc8315erdb.dts +++ b/arch/powerpc/boot/dts/mpc8315erdb.dts | |||
@@ -241,17 +241,16 @@ | |||
241 | }; | 241 | }; |
242 | 242 | ||
243 | crypto@30000 { | 243 | crypto@30000 { |
244 | model = "SEC3"; | 244 | compatible = "fsl,sec3.3", "fsl,sec3.1", "fsl,sec3.0", |
245 | device_type = "crypto"; | 245 | "fsl,sec2.4", "fsl,sec2.2", "fsl,sec2.1", |
246 | compatible = "talitos"; | 246 | "fsl,sec2.0"; |
247 | reg = <0x30000 0x10000>; | 247 | reg = <0x30000 0x10000>; |
248 | interrupts = <11 0x8>; | 248 | interrupts = <11 0x8>; |
249 | interrupt-parent = <&ipic>; | 249 | interrupt-parent = <&ipic>; |
250 | /* Rev. 3.0 geometry */ | 250 | fsl,num-channels = <4>; |
251 | num-channels = <4>; | 251 | fsl,channel-fifo-len = <24>; |
252 | channel-fifo-len = <24>; | 252 | fsl,exec-units-mask = <0x97c>; |
253 | exec-units-mask = <0x000001fe>; | 253 | fsl,descriptor-types-mask = <0x3ab0abf>; |
254 | descriptor-types-mask = <0x03ab0ebf>; | ||
255 | }; | 254 | }; |
256 | 255 | ||
257 | sata@18000 { | 256 | sata@18000 { |
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts index b5968b6c8a29..7345743d3d96 100644 --- a/arch/powerpc/boot/dts/mpc832x_mds.dts +++ b/arch/powerpc/boot/dts/mpc832x_mds.dts | |||
@@ -150,17 +150,14 @@ | |||
150 | }; | 150 | }; |
151 | 151 | ||
152 | crypto@30000 { | 152 | crypto@30000 { |
153 | device_type = "crypto"; | 153 | compatible = "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0"; |
154 | model = "SEC2"; | 154 | reg = <0x30000 0x10000>; |
155 | compatible = "talitos"; | ||
156 | reg = <0x30000 0x7000>; | ||
157 | interrupts = <11 0x8>; | 155 | interrupts = <11 0x8>; |
158 | interrupt-parent = <&ipic>; | 156 | interrupt-parent = <&ipic>; |
159 | /* Rev. 2.2 */ | 157 | fsl,num-channels = <1>; |
160 | num-channels = <1>; | 158 | fsl,channel-fifo-len = <24>; |
161 | channel-fifo-len = <24>; | 159 | fsl,exec-units-mask = <0x4c>; |
162 | exec-units-mask = <0x0000004c>; | 160 | fsl,descriptor-types-mask = <0x0122003f>; |
163 | descriptor-types-mask = <0x0122003f>; | ||
164 | }; | 161 | }; |
165 | 162 | ||
166 | ipic: pic@700 { | 163 | ipic: pic@700 { |
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts index a798d8639a7d..e74c045a0f8c 100644 --- a/arch/powerpc/boot/dts/mpc832x_rdb.dts +++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts | |||
@@ -128,17 +128,14 @@ | |||
128 | }; | 128 | }; |
129 | 129 | ||
130 | crypto@30000 { | 130 | crypto@30000 { |
131 | device_type = "crypto"; | 131 | compatible = "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0"; |
132 | model = "SEC2"; | 132 | reg = <0x30000 0x10000>; |
133 | compatible = "talitos"; | ||
134 | reg = <0x30000 0x7000>; | ||
135 | interrupts = <11 0x8>; | 133 | interrupts = <11 0x8>; |
136 | interrupt-parent = <&ipic>; | 134 | interrupt-parent = <&ipic>; |
137 | /* Rev. 2.2 */ | 135 | fsl,num-channels = <1>; |
138 | num-channels = <1>; | 136 | fsl,channel-fifo-len = <24>; |
139 | channel-fifo-len = <24>; | 137 | fsl,exec-units-mask = <0x4c>; |
140 | exec-units-mask = <0x0000004c>; | 138 | fsl,descriptor-types-mask = <0x0122003f>; |
141 | descriptor-types-mask = <0x0122003f>; | ||
142 | }; | 139 | }; |
143 | 140 | ||
144 | ipic:pic@700 { | 141 | ipic:pic@700 { |
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts index fc0f4c918c76..8dfab5662585 100644 --- a/arch/powerpc/boot/dts/mpc8349emitx.dts +++ b/arch/powerpc/boot/dts/mpc8349emitx.dts | |||
@@ -213,16 +213,14 @@ | |||
213 | }; | 213 | }; |
214 | 214 | ||
215 | crypto@30000 { | 215 | crypto@30000 { |
216 | device_type = "crypto"; | 216 | compatible = "fsl,sec2.0"; |
217 | model = "SEC2"; | ||
218 | compatible = "talitos"; | ||
219 | reg = <0x30000 0x10000>; | 217 | reg = <0x30000 0x10000>; |
220 | interrupts = <11 0x8>; | 218 | interrupts = <11 0x8>; |
221 | interrupt-parent = <&ipic>; | 219 | interrupt-parent = <&ipic>; |
222 | num-channels = <4>; | 220 | fsl,num-channels = <4>; |
223 | channel-fifo-len = <24>; | 221 | fsl,channel-fifo-len = <24>; |
224 | exec-units-mask = <0x0000007e>; | 222 | fsl,exec-units-mask = <0x7e>; |
225 | descriptor-types-mask = <0x01010ebf>; | 223 | fsl,descriptor-types-mask = <0x01010ebf>; |
226 | }; | 224 | }; |
227 | 225 | ||
228 | ipic: pic@700 { | 226 | ipic: pic@700 { |
diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts index e6afb1d1e19e..49ca3497eefb 100644 --- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts +++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts | |||
@@ -186,16 +186,14 @@ | |||
186 | }; | 186 | }; |
187 | 187 | ||
188 | crypto@30000 { | 188 | crypto@30000 { |
189 | device_type = "crypto"; | 189 | compatible = "fsl,sec2.0"; |
190 | model = "SEC2"; | ||
191 | compatible = "talitos"; | ||
192 | reg = <0x30000 0x10000>; | 190 | reg = <0x30000 0x10000>; |
193 | interrupts = <11 0x8>; | 191 | interrupts = <11 0x8>; |
194 | interrupt-parent = <&ipic>; | 192 | interrupt-parent = <&ipic>; |
195 | num-channels = <4>; | 193 | fsl,num-channels = <4>; |
196 | channel-fifo-len = <24>; | 194 | fsl,channel-fifo-len = <24>; |
197 | exec-units-mask = <0x0000007e>; | 195 | fsl,exec-units-mask = <0x7e>; |
198 | descriptor-types-mask = <0x01010ebf>; | 196 | fsl,descriptor-types-mask = <0x01010ebf>; |
199 | }; | 197 | }; |
200 | 198 | ||
201 | ipic: pic@700 { | 199 | ipic: pic@700 { |
diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts index 9c75c7c69e21..ba586cb7afbb 100644 --- a/arch/powerpc/boot/dts/mpc834x_mds.dts +++ b/arch/powerpc/boot/dts/mpc834x_mds.dts | |||
@@ -228,20 +228,15 @@ | |||
228 | interrupt-parent = <&ipic>; | 228 | interrupt-parent = <&ipic>; |
229 | }; | 229 | }; |
230 | 230 | ||
231 | /* May need to remove if on a part without crypto engine */ | ||
232 | crypto@30000 { | 231 | crypto@30000 { |
233 | device_type = "crypto"; | 232 | compatible = "fsl,sec2.0"; |
234 | model = "SEC2"; | ||
235 | compatible = "talitos"; | ||
236 | reg = <0x30000 0x10000>; | 233 | reg = <0x30000 0x10000>; |
237 | interrupts = <11 0x8>; | 234 | interrupts = <11 0x8>; |
238 | interrupt-parent = <&ipic>; | 235 | interrupt-parent = <&ipic>; |
239 | num-channels = <4>; | 236 | fsl,num-channels = <4>; |
240 | channel-fifo-len = <24>; | 237 | fsl,channel-fifo-len = <24>; |
241 | exec-units-mask = <0x0000007e>; | 238 | fsl,exec-units-mask = <0x7e>; |
242 | /* desc mask is for rev2.0, | 239 | fsl,descriptor-types-mask = <0x01010ebf>; |
243 | * we need runtime fixup for >2.0 */ | ||
244 | descriptor-types-mask = <0x01010ebf>; | ||
245 | }; | 240 | }; |
246 | 241 | ||
247 | /* IPIC | 242 | /* IPIC |
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts index 8e33b155f112..3701dae1ee02 100644 --- a/arch/powerpc/boot/dts/mpc836x_mds.dts +++ b/arch/powerpc/boot/dts/mpc836x_mds.dts | |||
@@ -154,17 +154,14 @@ | |||
154 | }; | 154 | }; |
155 | 155 | ||
156 | crypto@30000 { | 156 | crypto@30000 { |
157 | device_type = "crypto"; | 157 | compatible = "fsl,sec2.0"; |
158 | model = "SEC2"; | ||
159 | compatible = "talitos"; | ||
160 | reg = <0x30000 0x10000>; | 158 | reg = <0x30000 0x10000>; |
161 | interrupts = <11 0x8>; | 159 | interrupts = <11 0x8>; |
162 | interrupt-parent = <&ipic>; | 160 | interrupt-parent = <&ipic>; |
163 | num-channels = <4>; | 161 | fsl,num-channels = <4>; |
164 | channel-fifo-len = <24>; | 162 | fsl,channel-fifo-len = <24>; |
165 | exec-units-mask = <0x0000007e>; | 163 | fsl,exec-units-mask = <0x7e>; |
166 | /* desc mask is for rev1.x, we need runtime fixup for >=2.x */ | 164 | fsl,descriptor-types-mask = <0x01010ebf>; |
167 | descriptor-types-mask = <0x01010ebf>; | ||
168 | }; | 165 | }; |
169 | 166 | ||
170 | ipic: pic@700 { | 167 | ipic: pic@700 { |
diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts index 49a38cb95b52..0a700cb5f611 100644 --- a/arch/powerpc/boot/dts/mpc8377_mds.dts +++ b/arch/powerpc/boot/dts/mpc8377_mds.dts | |||
@@ -269,16 +269,15 @@ | |||
269 | }; | 269 | }; |
270 | 270 | ||
271 | crypto@30000 { | 271 | crypto@30000 { |
272 | model = "SEC3"; | 272 | compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2", |
273 | compatible = "talitos"; | 273 | "fsl,sec2.1", "fsl,sec2.0"; |
274 | reg = <0x30000 0x10000>; | 274 | reg = <0x30000 0x10000>; |
275 | interrupts = <11 0x8>; | 275 | interrupts = <11 0x8>; |
276 | interrupt-parent = <&ipic>; | 276 | interrupt-parent = <&ipic>; |
277 | /* Rev. 3.0 geometry */ | 277 | fsl,num-channels = <4>; |
278 | num-channels = <4>; | 278 | fsl,channel-fifo-len = <24>; |
279 | channel-fifo-len = <24>; | 279 | fsl,exec-units-mask = <0x9fe>; |
280 | exec-units-mask = <0x000001fe>; | 280 | fsl,descriptor-types-mask = <0x3ab0ebf>; |
281 | descriptor-types-mask = <0x03ab0ebf>; | ||
282 | }; | 281 | }; |
283 | 282 | ||
284 | sdhc@2e000 { | 283 | sdhc@2e000 { |
diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts index 1f4538790302..ed137aa83d5f 100644 --- a/arch/powerpc/boot/dts/mpc8377_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts | |||
@@ -248,17 +248,15 @@ | |||
248 | }; | 248 | }; |
249 | 249 | ||
250 | crypto@30000 { | 250 | crypto@30000 { |
251 | model = "SEC3"; | 251 | compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2", |
252 | device_type = "crypto"; | 252 | "fsl,sec2.1", "fsl,sec2.0"; |
253 | compatible = "talitos"; | ||
254 | reg = <0x30000 0x10000>; | 253 | reg = <0x30000 0x10000>; |
255 | interrupts = <11 0x8>; | 254 | interrupts = <11 0x8>; |
256 | interrupt-parent = <&ipic>; | 255 | interrupt-parent = <&ipic>; |
257 | /* Rev. 3.0 geometry */ | 256 | fsl,num-channels = <4>; |
258 | num-channels = <4>; | 257 | fsl,channel-fifo-len = <24>; |
259 | channel-fifo-len = <24>; | 258 | fsl,exec-units-mask = <0x9fe>; |
260 | exec-units-mask = <0x000001fe>; | 259 | fsl,descriptor-types-mask = <0x3ab0ebf>; |
261 | descriptor-types-mask = <0x03ab0ebf>; | ||
262 | }; | 260 | }; |
263 | 261 | ||
264 | sata@18000 { | 262 | sata@18000 { |
diff --git a/arch/powerpc/boot/dts/mpc8378_mds.dts b/arch/powerpc/boot/dts/mpc8378_mds.dts index 99ad49d4f13f..29c8c76a58f7 100644 --- a/arch/powerpc/boot/dts/mpc8378_mds.dts +++ b/arch/powerpc/boot/dts/mpc8378_mds.dts | |||
@@ -269,16 +269,15 @@ | |||
269 | }; | 269 | }; |
270 | 270 | ||
271 | crypto@30000 { | 271 | crypto@30000 { |
272 | model = "SEC3"; | 272 | compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2", |
273 | compatible = "talitos"; | 273 | "fsl,sec2.1", "fsl,sec2.0"; |
274 | reg = <0x30000 0x10000>; | 274 | reg = <0x30000 0x10000>; |
275 | interrupts = <11 0x8>; | 275 | interrupts = <11 0x8>; |
276 | interrupt-parent = <&ipic>; | 276 | interrupt-parent = <&ipic>; |
277 | /* Rev. 3.0 geometry */ | 277 | fsl,num-channels = <4>; |
278 | num-channels = <4>; | 278 | fsl,channel-fifo-len = <24>; |
279 | channel-fifo-len = <24>; | 279 | fsl,exec-units-mask = <0x9fe>; |
280 | exec-units-mask = <0x000001fe>; | 280 | fsl,descriptor-types-mask = <0x3ab0ebf>; |
281 | descriptor-types-mask = <0x03ab0ebf>; | ||
282 | }; | 281 | }; |
283 | 282 | ||
284 | sdhc@2e000 { | 283 | sdhc@2e000 { |
diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts index 44e34d3f21cf..34a7f2f935e1 100644 --- a/arch/powerpc/boot/dts/mpc8378_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts | |||
@@ -248,17 +248,15 @@ | |||
248 | }; | 248 | }; |
249 | 249 | ||
250 | crypto@30000 { | 250 | crypto@30000 { |
251 | model = "SEC3"; | 251 | compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2", |
252 | device_type = "crypto"; | 252 | "fsl,sec2.1", "fsl,sec2.0"; |
253 | compatible = "talitos"; | ||
254 | reg = <0x30000 0x10000>; | 253 | reg = <0x30000 0x10000>; |
255 | interrupts = <11 0x8>; | 254 | interrupts = <11 0x8>; |
256 | interrupt-parent = <&ipic>; | 255 | interrupt-parent = <&ipic>; |
257 | /* Rev. 3.0 geometry */ | 256 | fsl,num-channels = <4>; |
258 | num-channels = <4>; | 257 | fsl,channel-fifo-len = <24>; |
259 | channel-fifo-len = <24>; | 258 | fsl,exec-units-mask = <0x9fe>; |
260 | exec-units-mask = <0x000001fe>; | 259 | fsl,descriptor-types-mask = <0x3ab0ebf>; |
261 | descriptor-types-mask = <0x03ab0ebf>; | ||
262 | }; | 260 | }; |
263 | 261 | ||
264 | /* IPIC | 262 | /* IPIC |
diff --git a/arch/powerpc/boot/dts/mpc8379_mds.dts b/arch/powerpc/boot/dts/mpc8379_mds.dts index 980be8136276..d641a8985ea3 100644 --- a/arch/powerpc/boot/dts/mpc8379_mds.dts +++ b/arch/powerpc/boot/dts/mpc8379_mds.dts | |||
@@ -269,16 +269,15 @@ | |||
269 | }; | 269 | }; |
270 | 270 | ||
271 | crypto@30000 { | 271 | crypto@30000 { |
272 | model = "SEC3"; | 272 | compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2", |
273 | compatible = "talitos"; | 273 | "fsl,sec2.1", "fsl,sec2.0"; |
274 | reg = <0x30000 0x10000>; | 274 | reg = <0x30000 0x10000>; |
275 | interrupts = <11 0x8>; | 275 | interrupts = <11 0x8>; |
276 | interrupt-parent = <&ipic>; | 276 | interrupt-parent = <&ipic>; |
277 | /* Rev. 3.0 geometry */ | 277 | fsl,num-channels = <4>; |
278 | num-channels = <4>; | 278 | fsl,channel-fifo-len = <24>; |
279 | channel-fifo-len = <24>; | 279 | fsl,exec-units-mask = <0x9fe>; |
280 | exec-units-mask = <0x000001fe>; | 280 | fsl,descriptor-types-mask = <0x3ab0ebf>; |
281 | descriptor-types-mask = <0x03ab0ebf>; | ||
282 | }; | 281 | }; |
283 | 282 | ||
284 | sdhc@2e000 { | 283 | sdhc@2e000 { |
diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts index eeedf5884881..e4d7030d50e5 100644 --- a/arch/powerpc/boot/dts/mpc8379_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts | |||
@@ -248,17 +248,15 @@ | |||
248 | }; | 248 | }; |
249 | 249 | ||
250 | crypto@30000 { | 250 | crypto@30000 { |
251 | model = "SEC3"; | 251 | compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2", |
252 | device_type = "crypto"; | 252 | "fsl,sec2.1", "fsl,sec2.0"; |
253 | compatible = "talitos"; | ||
254 | reg = <0x30000 0x10000>; | 253 | reg = <0x30000 0x10000>; |
255 | interrupts = <11 0x8>; | 254 | interrupts = <11 0x8>; |
256 | interrupt-parent = <&ipic>; | 255 | interrupt-parent = <&ipic>; |
257 | /* Rev. 3.0 geometry */ | 256 | fsl,num-channels = <4>; |
258 | num-channels = <4>; | 257 | fsl,channel-fifo-len = <24>; |
259 | channel-fifo-len = <24>; | 258 | fsl,exec-units-mask = <0x9fe>; |
260 | exec-units-mask = <0x000001fe>; | 259 | fsl,descriptor-types-mask = <0x3ab0ebf>; |
261 | descriptor-types-mask = <0x03ab0ebf>; | ||
262 | }; | 260 | }; |
263 | 261 | ||
264 | sata@18000 { | 262 | sata@18000 { |
diff --git a/arch/powerpc/boot/dts/mpc8536ds.dts b/arch/powerpc/boot/dts/mpc8536ds.dts new file mode 100644 index 000000000000..02cfa24a1695 --- /dev/null +++ b/arch/powerpc/boot/dts/mpc8536ds.dts | |||
@@ -0,0 +1,432 @@ | |||
1 | /* | ||
2 | * MPC8536 DS Device Tree Source | ||
3 | * | ||
4 | * Copyright 2008 Freescale Semiconductor, Inc. | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify it | ||
7 | * under the terms of the GNU General Public License as published by the | ||
8 | * Free Software Foundation; either version 2 of the License, or (at your | ||
9 | * option) any later version. | ||
10 | */ | ||
11 | |||
12 | /dts-v1/; | ||
13 | |||
14 | / { | ||
15 | model = "fsl,mpc8536ds"; | ||
16 | compatible = "fsl,mpc8536ds"; | ||
17 | #address-cells = <1>; | ||
18 | #size-cells = <1>; | ||
19 | |||
20 | aliases { | ||
21 | ethernet0 = &enet0; | ||
22 | ethernet1 = &enet1; | ||
23 | serial0 = &serial0; | ||
24 | serial1 = &serial1; | ||
25 | pci0 = &pci0; | ||
26 | pci1 = &pci1; | ||
27 | pci2 = &pci2; | ||
28 | pci3 = &pci3; | ||
29 | }; | ||
30 | |||
31 | cpus { | ||
32 | #cpus = <1>; | ||
33 | #address-cells = <1>; | ||
34 | #size-cells = <0>; | ||
35 | |||
36 | PowerPC,8536@0 { | ||
37 | device_type = "cpu"; | ||
38 | reg = <0>; | ||
39 | next-level-cache = <&L2>; | ||
40 | }; | ||
41 | }; | ||
42 | |||
43 | memory { | ||
44 | device_type = "memory"; | ||
45 | reg = <00000000 00000000>; // Filled by U-Boot | ||
46 | }; | ||
47 | |||
48 | soc@ffe00000 { | ||
49 | #address-cells = <1>; | ||
50 | #size-cells = <1>; | ||
51 | device_type = "soc"; | ||
52 | ranges = <0x0 0xffe00000 0x100000>; | ||
53 | reg = <0xffe00000 0x1000>; | ||
54 | bus-frequency = <0>; // Filled out by uboot. | ||
55 | |||
56 | memory-controller@2000 { | ||
57 | compatible = "fsl,mpc8536-memory-controller"; | ||
58 | reg = <0x2000 0x1000>; | ||
59 | interrupt-parent = <&mpic>; | ||
60 | interrupts = <18 0x2>; | ||
61 | }; | ||
62 | |||
63 | L2: l2-cache-controller@20000 { | ||
64 | compatible = "fsl,mpc8536-l2-cache-controller"; | ||
65 | reg = <0x20000 0x1000>; | ||
66 | interrupt-parent = <&mpic>; | ||
67 | interrupts = <16 0x2>; | ||
68 | }; | ||
69 | |||
70 | i2c@3000 { | ||
71 | #address-cells = <1>; | ||
72 | #size-cells = <0>; | ||
73 | cell-index = <0>; | ||
74 | compatible = "fsl-i2c"; | ||
75 | reg = <0x3000 0x100>; | ||
76 | interrupts = <43 0x2>; | ||
77 | interrupt-parent = <&mpic>; | ||
78 | dfsrr; | ||
79 | }; | ||
80 | |||
81 | i2c@3100 { | ||
82 | #address-cells = <1>; | ||
83 | #size-cells = <0>; | ||
84 | cell-index = <1>; | ||
85 | compatible = "fsl-i2c"; | ||
86 | reg = <0x3100 0x100>; | ||
87 | interrupts = <43 0x2>; | ||
88 | interrupt-parent = <&mpic>; | ||
89 | dfsrr; | ||
90 | rtc@68 { | ||
91 | compatible = "dallas,ds3232"; | ||
92 | reg = <0x68>; | ||
93 | }; | ||
94 | }; | ||
95 | |||
96 | dma@21300 { | ||
97 | #address-cells = <1>; | ||
98 | #size-cells = <1>; | ||
99 | compatible = "fsl,mpc8536-dma", "fsl,eloplus-dma"; | ||
100 | reg = <0x21300 4>; | ||
101 | ranges = <0 0x21100 0x200>; | ||
102 | cell-index = <0>; | ||
103 | dma-channel@0 { | ||
104 | compatible = "fsl,mpc8536-dma-channel", | ||
105 | "fsl,eloplus-dma-channel"; | ||
106 | reg = <0x0 0x80>; | ||
107 | cell-index = <0>; | ||
108 | interrupt-parent = <&mpic>; | ||
109 | interrupts = <14 0x2>; | ||
110 | }; | ||
111 | dma-channel@80 { | ||
112 | compatible = "fsl,mpc8536-dma-channel", | ||
113 | "fsl,eloplus-dma-channel"; | ||
114 | reg = <0x80 0x80>; | ||
115 | cell-index = <1>; | ||
116 | interrupt-parent = <&mpic>; | ||
117 | interrupts = <15 0x2>; | ||
118 | }; | ||
119 | dma-channel@100 { | ||
120 | compatible = "fsl,mpc8536-dma-channel", | ||
121 | "fsl,eloplus-dma-channel"; | ||
122 | reg = <0x100 0x80>; | ||
123 | cell-index = <2>; | ||
124 | interrupt-parent = <&mpic>; | ||
125 | interrupts = <16 0x2>; | ||
126 | }; | ||
127 | dma-channel@180 { | ||
128 | compatible = "fsl,mpc8536-dma-channel", | ||
129 | "fsl,eloplus-dma-channel"; | ||
130 | reg = <0x180 0x80>; | ||
131 | cell-index = <3>; | ||
132 | interrupt-parent = <&mpic>; | ||
133 | interrupts = <17 0x2>; | ||
134 | }; | ||
135 | }; | ||
136 | |||
137 | mdio@24520 { | ||
138 | #address-cells = <1>; | ||
139 | #size-cells = <0>; | ||
140 | compatible = "fsl,gianfar-mdio"; | ||
141 | reg = <0x24520 0x20>; | ||
142 | |||
143 | phy0: ethernet-phy@0 { | ||
144 | interrupt-parent = <&mpic>; | ||
145 | interrupts = <10 0x1>; | ||
146 | reg = <0>; | ||
147 | device_type = "ethernet-phy"; | ||
148 | }; | ||
149 | phy1: ethernet-phy@1 { | ||
150 | interrupt-parent = <&mpic>; | ||
151 | interrupts = <10 0x1>; | ||
152 | reg = <1>; | ||
153 | device_type = "ethernet-phy"; | ||
154 | }; | ||
155 | }; | ||
156 | |||
157 | usb@22000 { | ||
158 | compatible = "fsl,mpc8536-usb2-mph", "fsl-usb2-mph"; | ||
159 | reg = <0x22000 0x1000>; | ||
160 | #address-cells = <1>; | ||
161 | #size-cells = <0>; | ||
162 | interrupt-parent = <&mpic>; | ||
163 | interrupts = <28 0x2>; | ||
164 | phy_type = "ulpi"; | ||
165 | }; | ||
166 | |||
167 | usb@23000 { | ||
168 | compatible = "fsl,mpc8536-usb2-mph", "fsl-usb2-mph"; | ||
169 | reg = <0x23000 0x1000>; | ||
170 | #address-cells = <1>; | ||
171 | #size-cells = <0>; | ||
172 | interrupt-parent = <&mpic>; | ||
173 | interrupts = <46 0x2>; | ||
174 | phy_type = "ulpi"; | ||
175 | }; | ||
176 | |||
177 | enet0: ethernet@24000 { | ||
178 | cell-index = <0>; | ||
179 | device_type = "network"; | ||
180 | model = "TSEC"; | ||
181 | compatible = "gianfar"; | ||
182 | reg = <0x24000 0x1000>; | ||
183 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
184 | interrupts = <29 2 30 2 34 2>; | ||
185 | interrupt-parent = <&mpic>; | ||
186 | phy-handle = <&phy1>; | ||
187 | phy-connection-type = "rgmii-id"; | ||
188 | }; | ||
189 | |||
190 | enet1: ethernet@26000 { | ||
191 | cell-index = <1>; | ||
192 | device_type = "network"; | ||
193 | model = "TSEC"; | ||
194 | compatible = "gianfar"; | ||
195 | reg = <0x26000 0x1000>; | ||
196 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
197 | interrupts = <31 2 32 2 33 2>; | ||
198 | interrupt-parent = <&mpic>; | ||
199 | phy-handle = <&phy0>; | ||
200 | phy-connection-type = "rgmii-id"; | ||
201 | }; | ||
202 | |||
203 | usb@2b000 { | ||
204 | compatible = "fsl,mpc8536-usb2-dr", "fsl-usb2-dr"; | ||
205 | reg = <0x2b000 0x1000>; | ||
206 | #address-cells = <1>; | ||
207 | #size-cells = <0>; | ||
208 | interrupt-parent = <&mpic>; | ||
209 | interrupts = <60 0x2>; | ||
210 | dr_mode = "peripheral"; | ||
211 | phy_type = "ulpi"; | ||
212 | }; | ||
213 | |||
214 | serial0: serial@4500 { | ||
215 | cell-index = <0>; | ||
216 | device_type = "serial"; | ||
217 | compatible = "ns16550"; | ||
218 | reg = <0x4500 0x100>; | ||
219 | clock-frequency = <0>; | ||
220 | interrupts = <42 0x2>; | ||
221 | interrupt-parent = <&mpic>; | ||
222 | }; | ||
223 | |||
224 | serial1: serial@4600 { | ||
225 | cell-index = <1>; | ||
226 | device_type = "serial"; | ||
227 | compatible = "ns16550"; | ||
228 | reg = <0x4600 0x100>; | ||
229 | clock-frequency = <0>; | ||
230 | interrupts = <42 0x2>; | ||
231 | interrupt-parent = <&mpic>; | ||
232 | }; | ||
233 | |||
234 | crypto@30000 { | ||
235 | compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2", | ||
236 | "fsl,sec2.1", "fsl,sec2.0"; | ||
237 | reg = <0x30000 0x10000>; | ||
238 | interrupts = <45 2 58 2>; | ||
239 | interrupt-parent = <&mpic>; | ||
240 | fsl,num-channels = <4>; | ||
241 | fsl,channel-fifo-len = <24>; | ||
242 | fsl,exec-units-mask = <0x9fe>; | ||
243 | fsl,descriptor-types-mask = <0x3ab0ebf>; | ||
244 | }; | ||
245 | |||
246 | sata@18000 { | ||
247 | compatible = "fsl,mpc8536-sata", "fsl,pq-sata"; | ||
248 | reg = <0x18000 0x1000>; | ||
249 | cell-index = <1>; | ||
250 | interrupts = <74 0x2>; | ||
251 | interrupt-parent = <&mpic>; | ||
252 | }; | ||
253 | |||
254 | sata@19000 { | ||
255 | compatible = "fsl,mpc8536-sata", "fsl,pq-sata"; | ||
256 | reg = <0x19000 0x1000>; | ||
257 | cell-index = <2>; | ||
258 | interrupts = <41 0x2>; | ||
259 | interrupt-parent = <&mpic>; | ||
260 | }; | ||
261 | |||
262 | global-utilities@e0000 { //global utilities block | ||
263 | compatible = "fsl,mpc8548-guts"; | ||
264 | reg = <0xe0000 0x1000>; | ||
265 | fsl,has-rstcr; | ||
266 | }; | ||
267 | |||
268 | mpic: pic@40000 { | ||
269 | clock-frequency = <0>; | ||
270 | interrupt-controller; | ||
271 | #address-cells = <0>; | ||
272 | #interrupt-cells = <2>; | ||
273 | reg = <0x40000 0x40000>; | ||
274 | compatible = "chrp,open-pic"; | ||
275 | device_type = "open-pic"; | ||
276 | big-endian; | ||
277 | }; | ||
278 | |||
279 | msi@41600 { | ||
280 | compatible = "fsl,mpc8536-msi", "fsl,mpic-msi"; | ||
281 | reg = <0x41600 0x80>; | ||
282 | msi-available-ranges = <0 0x100>; | ||
283 | interrupts = < | ||
284 | 0xe0 0 | ||
285 | 0xe1 0 | ||
286 | 0xe2 0 | ||
287 | 0xe3 0 | ||
288 | 0xe4 0 | ||
289 | 0xe5 0 | ||
290 | 0xe6 0 | ||
291 | 0xe7 0>; | ||
292 | interrupt-parent = <&mpic>; | ||
293 | }; | ||
294 | }; | ||
295 | |||
296 | pci0: pci@ffe08000 { | ||
297 | cell-index = <0>; | ||
298 | compatible = "fsl,mpc8540-pci"; | ||
299 | device_type = "pci"; | ||
300 | interrupt-map-mask = <0xf800 0x0 0x0 0x7>; | ||
301 | interrupt-map = < | ||
302 | |||
303 | /* IDSEL 0x11 J17 Slot 1 */ | ||
304 | 0x8800 0 0 1 &mpic 1 1 | ||
305 | 0x8800 0 0 2 &mpic 2 1 | ||
306 | 0x8800 0 0 3 &mpic 3 1 | ||
307 | 0x8800 0 0 4 &mpic 4 1>; | ||
308 | |||
309 | interrupt-parent = <&mpic>; | ||
310 | interrupts = <24 0x2>; | ||
311 | bus-range = <0 0xff>; | ||
312 | ranges = <0x02000000 0 0x80000000 0x80000000 0 0x10000000 | ||
313 | 0x01000000 0 0x00000000 0xffc00000 0 0x00010000>; | ||
314 | clock-frequency = <66666666>; | ||
315 | #interrupt-cells = <1>; | ||
316 | #size-cells = <2>; | ||
317 | #address-cells = <3>; | ||
318 | reg = <0xffe08000 0x1000>; | ||
319 | }; | ||
320 | |||
321 | pci1: pcie@ffe09000 { | ||
322 | cell-index = <1>; | ||
323 | compatible = "fsl,mpc8548-pcie"; | ||
324 | device_type = "pci"; | ||
325 | #interrupt-cells = <1>; | ||
326 | #size-cells = <2>; | ||
327 | #address-cells = <3>; | ||
328 | reg = <0xffe09000 0x1000>; | ||
329 | bus-range = <0 0xff>; | ||
330 | ranges = <0x02000000 0 0x98000000 0x98000000 0 0x08000000 | ||
331 | 0x01000000 0 0x00000000 0xffc20000 0 0x00010000>; | ||
332 | clock-frequency = <33333333>; | ||
333 | interrupt-parent = <&mpic>; | ||
334 | interrupts = <25 0x2>; | ||
335 | interrupt-map-mask = <0xf800 0 0 7>; | ||
336 | interrupt-map = < | ||
337 | /* IDSEL 0x0 */ | ||
338 | 0000 0 0 1 &mpic 4 1 | ||
339 | 0000 0 0 2 &mpic 5 1 | ||
340 | 0000 0 0 3 &mpic 6 1 | ||
341 | 0000 0 0 4 &mpic 7 1 | ||
342 | >; | ||
343 | pcie@0 { | ||
344 | reg = <0 0 0 0 0>; | ||
345 | #size-cells = <2>; | ||
346 | #address-cells = <3>; | ||
347 | device_type = "pci"; | ||
348 | ranges = <0x02000000 0 0x98000000 | ||
349 | 0x02000000 0 0x98000000 | ||
350 | 0 0x08000000 | ||
351 | |||
352 | 0x01000000 0 0x00000000 | ||
353 | 0x01000000 0 0x00000000 | ||
354 | 0 0x00010000>; | ||
355 | }; | ||
356 | }; | ||
357 | |||
358 | pci2: pcie@ffe0a000 { | ||
359 | cell-index = <2>; | ||
360 | compatible = "fsl,mpc8548-pcie"; | ||
361 | device_type = "pci"; | ||
362 | #interrupt-cells = <1>; | ||
363 | #size-cells = <2>; | ||
364 | #address-cells = <3>; | ||
365 | reg = <0xffe0a000 0x1000>; | ||
366 | bus-range = <0 0xff>; | ||
367 | ranges = <0x02000000 0 0x90000000 0x90000000 0 0x08000000 | ||
368 | 0x01000000 0 0x00000000 0xffc10000 0 0x00010000>; | ||
369 | clock-frequency = <33333333>; | ||
370 | interrupt-parent = <&mpic>; | ||
371 | interrupts = <26 0x2>; | ||
372 | interrupt-map-mask = <0xf800 0 0 7>; | ||
373 | interrupt-map = < | ||
374 | /* IDSEL 0x0 */ | ||
375 | 0000 0 0 1 &mpic 0 1 | ||
376 | 0000 0 0 2 &mpic 1 1 | ||
377 | 0000 0 0 3 &mpic 2 1 | ||
378 | 0000 0 0 4 &mpic 3 1 | ||
379 | >; | ||
380 | pcie@0 { | ||
381 | reg = <0 0 0 0 0>; | ||
382 | #size-cells = <2>; | ||
383 | #address-cells = <3>; | ||
384 | device_type = "pci"; | ||
385 | ranges = <0x02000000 0 0x90000000 | ||
386 | 0x02000000 0 0x90000000 | ||
387 | 0 0x08000000 | ||
388 | |||
389 | 0x01000000 0 0x00000000 | ||
390 | 0x01000000 0 0x00000000 | ||
391 | 0 0x00010000>; | ||
392 | }; | ||
393 | }; | ||
394 | |||
395 | pci3: pcie@ffe0b000 { | ||
396 | cell-index = <3>; | ||
397 | compatible = "fsl,mpc8548-pcie"; | ||
398 | device_type = "pci"; | ||
399 | #interrupt-cells = <1>; | ||
400 | #size-cells = <2>; | ||
401 | #address-cells = <3>; | ||
402 | reg = <0xffe0b000 0x1000>; | ||
403 | bus-range = <0 0xff>; | ||
404 | ranges = <0x02000000 0 0xa0000000 0xa0000000 0 0x20000000 | ||
405 | 0x01000000 0 0x00000000 0xffc30000 0 0x00010000>; | ||
406 | clock-frequency = <33333333>; | ||
407 | interrupt-parent = <&mpic>; | ||
408 | interrupts = <27 0x2>; | ||
409 | interrupt-map-mask = <0xf800 0 0 7>; | ||
410 | interrupt-map = < | ||
411 | /* IDSEL 0x0 */ | ||
412 | 0000 0 0 1 &mpic 8 1 | ||
413 | 0000 0 0 2 &mpic 9 1 | ||
414 | 0000 0 0 3 &mpic 10 1 | ||
415 | 0000 0 0 4 &mpic 11 1 | ||
416 | >; | ||
417 | |||
418 | pcie@0 { | ||
419 | reg = <0 0 0 0 0>; | ||
420 | #size-cells = <2>; | ||
421 | #address-cells = <3>; | ||
422 | device_type = "pci"; | ||
423 | ranges = <0x02000000 0 0xa0000000 | ||
424 | 0x02000000 0 0xa0000000 | ||
425 | 0 0x20000000 | ||
426 | |||
427 | 0x01000000 0 0x00000000 | ||
428 | 0x01000000 0 0x00000000 | ||
429 | 0 0x00100000>; | ||
430 | }; | ||
431 | }; | ||
432 | }; | ||
diff --git a/arch/powerpc/boot/dts/mpc8541cds.dts b/arch/powerpc/boot/dts/mpc8541cds.dts index 21ad71b825c1..c4469f19ff82 100644 --- a/arch/powerpc/boot/dts/mpc8541cds.dts +++ b/arch/powerpc/boot/dts/mpc8541cds.dts | |||
@@ -189,6 +189,17 @@ | |||
189 | interrupt-parent = <&mpic>; | 189 | interrupt-parent = <&mpic>; |
190 | }; | 190 | }; |
191 | 191 | ||
192 | crypto@30000 { | ||
193 | compatible = "fsl,sec2.0"; | ||
194 | reg = <0x30000 0x10000>; | ||
195 | interrupts = <45 2>; | ||
196 | interrupt-parent = <&mpic>; | ||
197 | fsl,num-channels = <4>; | ||
198 | fsl,channel-fifo-len = <24>; | ||
199 | fsl,exec-units-mask = <0x7e>; | ||
200 | fsl,descriptor-types-mask = <0x01010ebf>; | ||
201 | }; | ||
202 | |||
192 | mpic: pic@40000 { | 203 | mpic: pic@40000 { |
193 | interrupt-controller; | 204 | interrupt-controller; |
194 | #address-cells = <0>; | 205 | #address-cells = <0>; |
diff --git a/arch/powerpc/boot/dts/mpc8544ds.dts b/arch/powerpc/boot/dts/mpc8544ds.dts index 6cf533f4b5fb..7d3829d3495e 100644 --- a/arch/powerpc/boot/dts/mpc8544ds.dts +++ b/arch/powerpc/boot/dts/mpc8544ds.dts | |||
@@ -210,6 +210,17 @@ | |||
210 | fsl,has-rstcr; | 210 | fsl,has-rstcr; |
211 | }; | 211 | }; |
212 | 212 | ||
213 | crypto@30000 { | ||
214 | compatible = "fsl,sec2.1", "fsl,sec2.0"; | ||
215 | reg = <0x30000 0x10000>; | ||
216 | interrupts = <45 2>; | ||
217 | interrupt-parent = <&mpic>; | ||
218 | fsl,num-channels = <4>; | ||
219 | fsl,channel-fifo-len = <24>; | ||
220 | fsl,exec-units-mask = <0xfe>; | ||
221 | fsl,descriptor-types-mask = <0x12b0ebf>; | ||
222 | }; | ||
223 | |||
213 | mpic: pic@40000 { | 224 | mpic: pic@40000 { |
214 | interrupt-controller; | 225 | interrupt-controller; |
215 | #address-cells = <0>; | 226 | #address-cells = <0>; |
diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts index d1fa6bbfaea0..d84466bb7eca 100644 --- a/arch/powerpc/boot/dts/mpc8548cds.dts +++ b/arch/powerpc/boot/dts/mpc8548cds.dts | |||
@@ -249,6 +249,17 @@ | |||
249 | fsl,has-rstcr; | 249 | fsl,has-rstcr; |
250 | }; | 250 | }; |
251 | 251 | ||
252 | crypto@30000 { | ||
253 | compatible = "fsl,sec2.1", "fsl,sec2.0"; | ||
254 | reg = <0x30000 0x10000>; | ||
255 | interrupts = <45 2>; | ||
256 | interrupt-parent = <&mpic>; | ||
257 | fsl,num-channels = <4>; | ||
258 | fsl,channel-fifo-len = <24>; | ||
259 | fsl,exec-units-mask = <0xfe>; | ||
260 | fsl,descriptor-types-mask = <0x12b0ebf>; | ||
261 | }; | ||
262 | |||
252 | mpic: pic@40000 { | 263 | mpic: pic@40000 { |
253 | interrupt-controller; | 264 | interrupt-controller; |
254 | #address-cells = <0>; | 265 | #address-cells = <0>; |
diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts b/arch/powerpc/boot/dts/mpc8555cds.dts index 6fc8059b5a01..e03a78006283 100644 --- a/arch/powerpc/boot/dts/mpc8555cds.dts +++ b/arch/powerpc/boot/dts/mpc8555cds.dts | |||
@@ -189,6 +189,17 @@ | |||
189 | interrupt-parent = <&mpic>; | 189 | interrupt-parent = <&mpic>; |
190 | }; | 190 | }; |
191 | 191 | ||
192 | crypto@30000 { | ||
193 | compatible = "fsl,sec2.0"; | ||
194 | reg = <0x30000 0x10000>; | ||
195 | interrupts = <45 2>; | ||
196 | interrupt-parent = <&mpic>; | ||
197 | fsl,num-channels = <4>; | ||
198 | fsl,channel-fifo-len = <24>; | ||
199 | fsl,exec-units-mask = <0x7e>; | ||
200 | fsl,descriptor-types-mask = <0x01010ebf>; | ||
201 | }; | ||
202 | |||
192 | mpic: pic@40000 { | 203 | mpic: pic@40000 { |
193 | interrupt-controller; | 204 | interrupt-controller; |
194 | #address-cells = <0>; | 205 | #address-cells = <0>; |
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts index be9a289c0d62..9c30a34821dc 100644 --- a/arch/powerpc/boot/dts/mpc8568mds.dts +++ b/arch/powerpc/boot/dts/mpc8568mds.dts | |||
@@ -231,16 +231,14 @@ | |||
231 | }; | 231 | }; |
232 | 232 | ||
233 | crypto@30000 { | 233 | crypto@30000 { |
234 | device_type = "crypto"; | 234 | compatible = "fsl,sec2.1", "fsl,sec2.0"; |
235 | model = "SEC2"; | 235 | reg = <0x30000 0x10000>; |
236 | compatible = "talitos"; | ||
237 | reg = <0x30000 0xf000>; | ||
238 | interrupts = <45 2>; | 236 | interrupts = <45 2>; |
239 | interrupt-parent = <&mpic>; | 237 | interrupt-parent = <&mpic>; |
240 | num-channels = <4>; | 238 | fsl,num-channels = <4>; |
241 | channel-fifo-len = <24>; | 239 | fsl,channel-fifo-len = <24>; |
242 | exec-units-mask = <0xfe>; | 240 | fsl,exec-units-mask = <0xfe>; |
243 | descriptor-types-mask = <0x12b0ebf>; | 241 | fsl,descriptor-types-mask = <0x12b0ebf>; |
244 | }; | 242 | }; |
245 | 243 | ||
246 | mpic: pic@40000 { | 244 | mpic: pic@40000 { |
diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts index cb06325f0b79..08c61e3daecc 100644 --- a/arch/powerpc/boot/dts/mpc8572ds.dts +++ b/arch/powerpc/boot/dts/mpc8572ds.dts | |||
@@ -321,6 +321,18 @@ | |||
321 | interrupt-parent = <&mpic>; | 321 | interrupt-parent = <&mpic>; |
322 | }; | 322 | }; |
323 | 323 | ||
324 | crypto@30000 { | ||
325 | compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2", | ||
326 | "fsl,sec2.1", "fsl,sec2.0"; | ||
327 | reg = <0x30000 0x10000>; | ||
328 | interrupts = <45 2 58 2>; | ||
329 | interrupt-parent = <&mpic>; | ||
330 | fsl,num-channels = <4>; | ||
331 | fsl,channel-fifo-len = <24>; | ||
332 | fsl,exec-units-mask = <0x9fe>; | ||
333 | fsl,descriptor-types-mask = <0x3ab0ebf>; | ||
334 | }; | ||
335 | |||
324 | mpic: pic@40000 { | 336 | mpic: pic@40000 { |
325 | interrupt-controller; | 337 | interrupt-controller; |
326 | #address-cells = <0>; | 338 | #address-cells = <0>; |
diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts index 65a5f64b2339..981941e5d7a5 100644 --- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts +++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts | |||
@@ -363,7 +363,7 @@ | |||
363 | 0xe000 0 0 4 &mpic 1 1 | 363 | 0xe000 0 0 4 &mpic 1 1 |
364 | 364 | ||
365 | /* IDSEL 0x1f */ | 365 | /* IDSEL 0x1f */ |
366 | 0xf800 0 0 1 &mpic 3 0 | 366 | 0xf800 0 0 1 &mpic 3 2 |
367 | 0xf800 0 0 2 &mpic 0 1 | 367 | 0xf800 0 0 2 &mpic 0 1 |
368 | >; | 368 | >; |
369 | 369 | ||
diff --git a/arch/powerpc/boot/dts/mpc866ads.dts b/arch/powerpc/boot/dts/mpc866ads.dts index 765e43c997da..bd700651f360 100644 --- a/arch/powerpc/boot/dts/mpc866ads.dts +++ b/arch/powerpc/boot/dts/mpc866ads.dts | |||
@@ -171,6 +171,17 @@ | |||
171 | fsl,cpm-command = <0000>; | 171 | fsl,cpm-command = <0000>; |
172 | linux,network-index = <1>; | 172 | linux,network-index = <1>; |
173 | }; | 173 | }; |
174 | |||
175 | i2c@860 { | ||
176 | compatible = "fsl,mpc866-i2c", | ||
177 | "fsl,cpm1-i2c"; | ||
178 | reg = <0x860 0x20 0x3c80 0x30>; | ||
179 | interrupts = <16>; | ||
180 | interrupt-parent = <&CPM_PIC>; | ||
181 | fsl,cpm-command = <0x10>; | ||
182 | #address-cells = <1>; | ||
183 | #size-cells = <0>; | ||
184 | }; | ||
174 | }; | 185 | }; |
175 | }; | 186 | }; |
176 | 187 | ||
diff --git a/arch/powerpc/boot/dts/mpc885ads.dts b/arch/powerpc/boot/dts/mpc885ads.dts index 9895043722b9..b123e9f7a5a8 100644 --- a/arch/powerpc/boot/dts/mpc885ads.dts +++ b/arch/powerpc/boot/dts/mpc885ads.dts | |||
@@ -215,6 +215,17 @@ | |||
215 | fsl,cpm-command = <0x80>; | 215 | fsl,cpm-command = <0x80>; |
216 | linux,network-index = <2>; | 216 | linux,network-index = <2>; |
217 | }; | 217 | }; |
218 | |||
219 | i2c@860 { | ||
220 | compatible = "fsl,mpc885-i2c", | ||
221 | "fsl,cpm1-i2c"; | ||
222 | reg = <0x860 0x20 0x3c80 0x30>; | ||
223 | interrupts = <16>; | ||
224 | interrupt-parent = <&CPM_PIC>; | ||
225 | fsl,cpm-command = <0x10>; | ||
226 | #address-cells = <1>; | ||
227 | #size-cells = <0>; | ||
228 | }; | ||
218 | }; | 229 | }; |
219 | }; | 230 | }; |
220 | 231 | ||
diff --git a/arch/powerpc/boot/dts/rainier.dts b/arch/powerpc/boot/dts/rainier.dts index 2afb63a42ea9..9684c80e4093 100644 --- a/arch/powerpc/boot/dts/rainier.dts +++ b/arch/powerpc/boot/dts/rainier.dts | |||
@@ -265,7 +265,7 @@ | |||
265 | #size-cells = <0>; | 265 | #size-cells = <0>; |
266 | interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4 | 266 | interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4 |
267 | /*Wake*/ 0x1 &UIC1 0x1d 0x4>; | 267 | /*Wake*/ 0x1 &UIC1 0x1d 0x4>; |
268 | reg = <0xef600e00 0x00000070>; | 268 | reg = <0xef600e00 0x00000074>; |
269 | local-mac-address = [000000000000]; | 269 | local-mac-address = [000000000000]; |
270 | mal-device = <&MAL0>; | 270 | mal-device = <&MAL0>; |
271 | mal-tx-channel = <0>; | 271 | mal-tx-channel = <0>; |
@@ -294,7 +294,7 @@ | |||
294 | #size-cells = <0>; | 294 | #size-cells = <0>; |
295 | interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4 | 295 | interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4 |
296 | /*Wake*/ 0x1 &UIC1 0x1f 0x4>; | 296 | /*Wake*/ 0x1 &UIC1 0x1f 0x4>; |
297 | reg = <0xef600f00 0x00000070>; | 297 | reg = <0xef600f00 0x00000074>; |
298 | local-mac-address = [000000000000]; | 298 | local-mac-address = [000000000000]; |
299 | mal-device = <&MAL0>; | 299 | mal-device = <&MAL0>; |
300 | mal-tx-channel = <1>; | 300 | mal-tx-channel = <1>; |
diff --git a/arch/powerpc/boot/dts/sbc8349.dts b/arch/powerpc/boot/dts/sbc8349.dts index 5b76bb26085a..45f789b56709 100644 --- a/arch/powerpc/boot/dts/sbc8349.dts +++ b/arch/powerpc/boot/dts/sbc8349.dts | |||
@@ -221,19 +221,15 @@ | |||
221 | interrupt-parent = <&ipic>; | 221 | interrupt-parent = <&ipic>; |
222 | }; | 222 | }; |
223 | 223 | ||
224 | /* May need to remove if on a part without crypto engine */ | ||
225 | crypto@30000 { | 224 | crypto@30000 { |
226 | model = "SEC2"; | 225 | compatible = "fsl,sec2.0"; |
227 | compatible = "talitos"; | ||
228 | reg = <0x30000 0x10000>; | 226 | reg = <0x30000 0x10000>; |
229 | interrupts = <11 0x8>; | 227 | interrupts = <11 0x8>; |
230 | interrupt-parent = <&ipic>; | 228 | interrupt-parent = <&ipic>; |
231 | num-channels = <4>; | 229 | fsl,num-channels = <4>; |
232 | channel-fifo-len = <24>; | 230 | fsl,channel-fifo-len = <24>; |
233 | exec-units-mask = <0x0000007e>; | 231 | fsl,exec-units-mask = <0x7e>; |
234 | /* desc mask is for rev2.0, | 232 | fsl,descriptor-types-mask = <0x01010ebf>; |
235 | * we need runtime fixup for >2.0 */ | ||
236 | descriptor-types-mask = <0x01010ebf>; | ||
237 | }; | 233 | }; |
238 | 234 | ||
239 | /* IPIC | 235 | /* IPIC |
diff --git a/arch/powerpc/boot/dts/sbc8548.dts b/arch/powerpc/boot/dts/sbc8548.dts index 21cbacb1000c..333552b4e90d 100644 --- a/arch/powerpc/boot/dts/sbc8548.dts +++ b/arch/powerpc/boot/dts/sbc8548.dts | |||
@@ -304,6 +304,17 @@ | |||
304 | fsl,has-rstcr; | 304 | fsl,has-rstcr; |
305 | }; | 305 | }; |
306 | 306 | ||
307 | crypto@30000 { | ||
308 | compatible = "fsl,sec2.1", "fsl,sec2.0"; | ||
309 | reg = <0x30000 0x10000>; | ||
310 | interrupts = <45 2>; | ||
311 | interrupt-parent = <&mpic>; | ||
312 | fsl,num-channels = <4>; | ||
313 | fsl,channel-fifo-len = <24>; | ||
314 | fsl,exec-units-mask = <0xfe>; | ||
315 | fsl,descriptor-types-mask = <0x12b0ebf>; | ||
316 | }; | ||
317 | |||
307 | mpic: pic@40000 { | 318 | mpic: pic@40000 { |
308 | interrupt-controller; | 319 | interrupt-controller; |
309 | #address-cells = <0>; | 320 | #address-cells = <0>; |
diff --git a/arch/powerpc/boot/dts/sequoia.dts b/arch/powerpc/boot/dts/sequoia.dts index 149dabc55217..72d15f075d34 100644 --- a/arch/powerpc/boot/dts/sequoia.dts +++ b/arch/powerpc/boot/dts/sequoia.dts | |||
@@ -280,7 +280,7 @@ | |||
280 | #size-cells = <0>; | 280 | #size-cells = <0>; |
281 | interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4 | 281 | interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4 |
282 | /*Wake*/ 0x1 &UIC1 0x1d 0x4>; | 282 | /*Wake*/ 0x1 &UIC1 0x1d 0x4>; |
283 | reg = <0xef600e00 0x00000070>; | 283 | reg = <0xef600e00 0x00000074>; |
284 | local-mac-address = [000000000000]; | 284 | local-mac-address = [000000000000]; |
285 | mal-device = <&MAL0>; | 285 | mal-device = <&MAL0>; |
286 | mal-tx-channel = <0>; | 286 | mal-tx-channel = <0>; |
@@ -309,7 +309,7 @@ | |||
309 | #size-cells = <0>; | 309 | #size-cells = <0>; |
310 | interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4 | 310 | interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4 |
311 | /*Wake*/ 0x1 &UIC1 0x1f 0x4>; | 311 | /*Wake*/ 0x1 &UIC1 0x1f 0x4>; |
312 | reg = <0xef600f00 0x00000070>; | 312 | reg = <0xef600f00 0x00000074>; |
313 | local-mac-address = [000000000000]; | 313 | local-mac-address = [000000000000]; |
314 | mal-device = <&MAL0>; | 314 | mal-device = <&MAL0>; |
315 | mal-tx-channel = <1>; | 315 | mal-tx-channel = <1>; |
diff --git a/arch/powerpc/boot/dts/taishan.dts b/arch/powerpc/boot/dts/taishan.dts index d4867ded8699..058438f9629b 100644 --- a/arch/powerpc/boot/dts/taishan.dts +++ b/arch/powerpc/boot/dts/taishan.dts | |||
@@ -287,7 +287,7 @@ | |||
287 | compatible = "ibm,emac-440gx", "ibm,emac4"; | 287 | compatible = "ibm,emac-440gx", "ibm,emac4"; |
288 | interrupt-parent = <&UIC1>; | 288 | interrupt-parent = <&UIC1>; |
289 | interrupts = <0x1c 0x4 0x1d 0x4>; | 289 | interrupts = <0x1c 0x4 0x1d 0x4>; |
290 | reg = <0x40000800 0x00000070>; | 290 | reg = <0x40000800 0x00000074>; |
291 | local-mac-address = [000000000000]; // Filled in by zImage | 291 | local-mac-address = [000000000000]; // Filled in by zImage |
292 | mal-device = <&MAL0>; | 292 | mal-device = <&MAL0>; |
293 | mal-tx-channel = <0>; | 293 | mal-tx-channel = <0>; |
@@ -307,7 +307,7 @@ | |||
307 | compatible = "ibm,emac-440gx", "ibm,emac4"; | 307 | compatible = "ibm,emac-440gx", "ibm,emac4"; |
308 | interrupt-parent = <&UIC1>; | 308 | interrupt-parent = <&UIC1>; |
309 | interrupts = <0x1e 0x4 0x1f 0x4>; | 309 | interrupts = <0x1e 0x4 0x1f 0x4>; |
310 | reg = <0x40000900 0x00000070>; | 310 | reg = <0x40000900 0x00000074>; |
311 | local-mac-address = [000000000000]; // Filled in by zImage | 311 | local-mac-address = [000000000000]; // Filled in by zImage |
312 | mal-device = <&MAL0>; | 312 | mal-device = <&MAL0>; |
313 | mal-tx-channel = <1>; | 313 | mal-tx-channel = <1>; |
@@ -327,7 +327,7 @@ | |||
327 | compatible = "ibm,emac-440gx", "ibm,emac4"; | 327 | compatible = "ibm,emac-440gx", "ibm,emac4"; |
328 | interrupt-parent = <&UIC2>; | 328 | interrupt-parent = <&UIC2>; |
329 | interrupts = <0x0 0x4 0x1 0x4>; | 329 | interrupts = <0x0 0x4 0x1 0x4>; |
330 | reg = <0x40000c00 0x00000070>; | 330 | reg = <0x40000c00 0x00000074>; |
331 | local-mac-address = [000000000000]; // Filled in by zImage | 331 | local-mac-address = [000000000000]; // Filled in by zImage |
332 | mal-device = <&MAL0>; | 332 | mal-device = <&MAL0>; |
333 | mal-tx-channel = <2>; | 333 | mal-tx-channel = <2>; |
@@ -351,7 +351,7 @@ | |||
351 | compatible = "ibm,emac-440gx", "ibm,emac4"; | 351 | compatible = "ibm,emac-440gx", "ibm,emac4"; |
352 | interrupt-parent = <&UIC2>; | 352 | interrupt-parent = <&UIC2>; |
353 | interrupts = <0x2 0x4 0x3 0x4>; | 353 | interrupts = <0x2 0x4 0x3 0x4>; |
354 | reg = <0x40000e00 0x00000070>; | 354 | reg = <0x40000e00 0x00000074>; |
355 | local-mac-address = [000000000000]; // Filled in by zImage | 355 | local-mac-address = [000000000000]; // Filled in by zImage |
356 | mal-device = <&MAL0>; | 356 | mal-device = <&MAL0>; |
357 | mal-tx-channel = <3>; | 357 | mal-tx-channel = <3>; |
diff --git a/arch/powerpc/boot/dts/tqm8541.dts b/arch/powerpc/boot/dts/tqm8541.dts index d083a648a81d..d76441ec5dc7 100644 --- a/arch/powerpc/boot/dts/tqm8541.dts +++ b/arch/powerpc/boot/dts/tqm8541.dts | |||
@@ -200,6 +200,17 @@ | |||
200 | interrupt-parent = <&mpic>; | 200 | interrupt-parent = <&mpic>; |
201 | }; | 201 | }; |
202 | 202 | ||
203 | crypto@30000 { | ||
204 | compatible = "fsl,sec2.0"; | ||
205 | reg = <0x30000 0x10000>; | ||
206 | interrupts = <45 2>; | ||
207 | interrupt-parent = <&mpic>; | ||
208 | fsl,num-channels = <4>; | ||
209 | fsl,channel-fifo-len = <24>; | ||
210 | fsl,exec-units-mask = <0x7e>; | ||
211 | fsl,descriptor-types-mask = <0x01010ebf>; | ||
212 | }; | ||
213 | |||
203 | mpic: pic@40000 { | 214 | mpic: pic@40000 { |
204 | interrupt-controller; | 215 | interrupt-controller; |
205 | #address-cells = <0>; | 216 | #address-cells = <0>; |
diff --git a/arch/powerpc/boot/dts/tqm8548.dts b/arch/powerpc/boot/dts/tqm8548.dts index 13cd7280cb26..2563112cabd3 100644 --- a/arch/powerpc/boot/dts/tqm8548.dts +++ b/arch/powerpc/boot/dts/tqm8548.dts | |||
@@ -83,6 +83,11 @@ | |||
83 | interrupts = <43 2>; | 83 | interrupts = <43 2>; |
84 | interrupt-parent = <&mpic>; | 84 | interrupt-parent = <&mpic>; |
85 | dfsrr; | 85 | dfsrr; |
86 | |||
87 | rtc@68 { | ||
88 | compatible = "dallas,ds1337"; | ||
89 | reg = <0x68>; | ||
90 | }; | ||
86 | }; | 91 | }; |
87 | 92 | ||
88 | i2c@3100 { | 93 | i2c@3100 { |
diff --git a/arch/powerpc/boot/dts/tqm8555.dts b/arch/powerpc/boot/dts/tqm8555.dts index 96b0b94ad925..6f7ea59c4846 100644 --- a/arch/powerpc/boot/dts/tqm8555.dts +++ b/arch/powerpc/boot/dts/tqm8555.dts | |||
@@ -200,6 +200,17 @@ | |||
200 | interrupt-parent = <&mpic>; | 200 | interrupt-parent = <&mpic>; |
201 | }; | 201 | }; |
202 | 202 | ||
203 | crypto@30000 { | ||
204 | compatible = "fsl,sec2.0"; | ||
205 | reg = <0x30000 0x10000>; | ||
206 | interrupts = <45 2>; | ||
207 | interrupt-parent = <&mpic>; | ||
208 | fsl,num-channels = <4>; | ||
209 | fsl,channel-fifo-len = <24>; | ||
210 | fsl,exec-units-mask = <0x7e>; | ||
211 | fsl,descriptor-types-mask = <0x01010ebf>; | ||
212 | }; | ||
213 | |||
203 | mpic: pic@40000 { | 214 | mpic: pic@40000 { |
204 | interrupt-controller; | 215 | interrupt-controller; |
205 | #address-cells = <0>; | 216 | #address-cells = <0>; |