diff options
author | Kim Phillips <kim.phillips@freescale.com> | 2008-07-08 20:13:33 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-07-14 08:55:47 -0400 |
commit | 3fd44736db9a5bf33e4a216b9cd43c9cfd57c459 (patch) | |
tree | 855b82f0fad5dbff233bb89a389fb556e737980f /arch/powerpc | |
parent | d0fc2eaaf4c56a95f5ed29b6bfb609e19714fc16 (diff) |
powerpc/fsl: update crypto node definition and device tree instances
delete obsolete device-type property, delete model property
(use compatible property instead), prepend "fsl," to Freescale
specific properties. Add nodes to device trees that are missing them,
and fix broken property values in other trees.
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
26 files changed, 200 insertions, 143 deletions
diff --git a/arch/powerpc/boot/dts/mpc8272ads.dts b/arch/powerpc/boot/dts/mpc8272ads.dts index d27f8a73c24a..2a1929acaabd 100644 --- a/arch/powerpc/boot/dts/mpc8272ads.dts +++ b/arch/powerpc/boot/dts/mpc8272ads.dts | |||
@@ -237,22 +237,15 @@ | |||
237 | compatible = "fsl,mpc8272-pic", "fsl,cpm2-pic"; | 237 | compatible = "fsl,mpc8272-pic", "fsl,cpm2-pic"; |
238 | }; | 238 | }; |
239 | 239 | ||
240 | /* May need to remove if on a part without crypto engine */ | ||
241 | crypto@30000 { | 240 | crypto@30000 { |
242 | device_type = "crypto"; | 241 | compatible = "fsl,sec1.0"; |
243 | model = "SEC2"; | 242 | reg = <0x40000 0x13000>; |
244 | compatible = "fsl,mpc8272-talitos-sec2", | 243 | interrupts = <47 0x8>; |
245 | "fsl,talitos-sec2", | ||
246 | "fsl,talitos", | ||
247 | "talitos"; | ||
248 | reg = <0x30000 0x10000>; | ||
249 | interrupts = <11 8>; | ||
250 | interrupt-parent = <&PIC>; | 244 | interrupt-parent = <&PIC>; |
251 | num-channels = <4>; | 245 | fsl,num-channels = <4>; |
252 | channel-fifo-len = <24>; | 246 | fsl,channel-fifo-len = <24>; |
253 | exec-units-mask = <0x7e>; | 247 | fsl,exec-units-mask = <0x7e>; |
254 | /* desc mask is for rev1.x, we need runtime fixup for >=2.x */ | 248 | fsl,descriptor-types-mask = <0x1010415>; |
255 | descriptor-types-mask = <0x1010ebf>; | ||
256 | }; | 249 | }; |
257 | }; | 250 | }; |
258 | 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 index 98ad27a2ddee..02cfa24a1695 100644 --- a/arch/powerpc/boot/dts/mpc8536ds.dts +++ b/arch/powerpc/boot/dts/mpc8536ds.dts | |||
@@ -231,6 +231,18 @@ | |||
231 | interrupt-parent = <&mpic>; | 231 | interrupt-parent = <&mpic>; |
232 | }; | 232 | }; |
233 | 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 | |||
234 | sata@18000 { | 246 | sata@18000 { |
235 | compatible = "fsl,mpc8536-sata", "fsl,pq-sata"; | 247 | compatible = "fsl,mpc8536-sata", "fsl,pq-sata"; |
236 | reg = <0x18000 0x1000>; | 248 | reg = <0x18000 0x1000>; |
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/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/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/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>; |