aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/devicetree/bindings/crypto/fsl-sec4.txt68
-rw-r--r--arch/powerpc/boot/dts/p4080ds.dts41
-rw-r--r--drivers/crypto/caam/caamalg.c4
-rw-r--r--drivers/crypto/caam/ctrl.c6
4 files changed, 60 insertions, 59 deletions
diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
index fce16a85e2c5..568aa3cb5276 100644
--- a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
+++ b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
@@ -53,7 +53,7 @@ PROPERTIES
53 - compatible 53 - compatible
54 Usage: required 54 Usage: required
55 Value type: <string> 55 Value type: <string>
56 Definition: Must include "fsl,p4080-sec4.0","fsl,sec-4.0" 56 Definition: Must include "fsl,p4080-sec-v4.0","fsl,sec-v4.0"
57 57
58 - #address-cells 58 - #address-cells
59 Usage: required 59 Usage: required
@@ -72,7 +72,7 @@ PROPERTIES
72 Usage: required 72 Usage: required
73 Value type: <prop-encoded-array> 73 Value type: <prop-encoded-array>
74 Definition: A standard property. Specifies the physical 74 Definition: A standard property. Specifies the physical
75 address and length of the SEC4.0 configuration registers. 75 address and length of the SEC4 configuration registers.
76 registers 76 registers
77 77
78 - ranges 78 - ranges
@@ -105,7 +105,7 @@ PROPERTIES
105 105
106EXAMPLE 106EXAMPLE
107 crypto@300000 { 107 crypto@300000 {
108 compatible = "fsl,p4080-sec4.0", "fsl,sec4.0"; 108 compatible = "fsl,p4080-sec-v4.0", "fsl,sec-v4.0";
109 #address-cells = <1>; 109 #address-cells = <1>;
110 #size-cells = <1>; 110 #size-cells = <1>;
111 reg = <0x300000 0x10000>; 111 reg = <0x300000 0x10000>;
@@ -127,7 +127,7 @@ P4080 Job Ring (JR) Node
127 - compatible 127 - compatible
128 Usage: required 128 Usage: required
129 Value type: <string> 129 Value type: <string>
130 Definition: Must include "fsl,p4080-sec4.0-job-ring","fsl,sec4.0-job-ring" 130 Definition: Must include "fsl,p4080-sec-v4.0-job-ring","fsl,sec-v4.0-job-ring"
131 131
132 - reg 132 - reg
133 Usage: required 133 Usage: required
@@ -163,8 +163,8 @@ P4080 Job Ring (JR) Node
163 163
164EXAMPLE 164EXAMPLE
165 jr@1000 { 165 jr@1000 {
166 compatible = "fsl,p4080-sec4.0-job-ring", 166 compatible = "fsl,p4080-sec-v4.0-job-ring",
167 "fsl,sec4.0-job-ring"; 167 "fsl,sec-v4.0-job-ring";
168 reg = <0x1000 0x1000>; 168 reg = <0x1000 0x1000>;
169 fsl,liodn = <0x081>; 169 fsl,liodn = <0x081>;
170 interrupt-parent = <&mpic>; 170 interrupt-parent = <&mpic>;
@@ -186,7 +186,7 @@ P4080 Run Time Integrity Check (RTIC) Node
186 - compatible 186 - compatible
187 Usage: required 187 Usage: required
188 Value type: <string> 188 Value type: <string>
189 Definition: Must include "fsl,p4080-sec4.0-rtic","fsl,sec4.0-rtic". 189 Definition: Must include "fsl,p4080-sec-v4.0-rtic","fsl,sec-v4.0-rtic".
190 190
191 - #address-cells 191 - #address-cells
192 Usage: required 192 Usage: required
@@ -219,8 +219,8 @@ P4080 Run Time Integrity Check (RTIC) Node
219 219
220EXAMPLE 220EXAMPLE
221 rtic@6000 { 221 rtic@6000 {
222 compatible = "fsl,p4080-sec4.0-rtic", 222 compatible = "fsl,p4080-sec-v4.0-rtic",
223 "fsl,sec4.0-rtic"; 223 "fsl,sec-v4.0-rtic";
224 #address-cells = <1>; 224 #address-cells = <1>;
225 #size-cells = <1>; 225 #size-cells = <1>;
226 reg = <0x6000 0x100>; 226 reg = <0x6000 0x100>;
@@ -238,7 +238,7 @@ P4080 Run Time Integrity Check (RTIC) Memory Node
238 - compatible 238 - compatible
239 Usage: required 239 Usage: required
240 Value type: <string> 240 Value type: <string>
241 Definition: Must include "fsl,p4080-sec4.0-rtic-memory","fsl,sec4.0-rtic-memory". 241 Definition: Must include "fsl,p4080-sec-v4.0-rtic-memory","fsl,sec-v4.0-rtic-memory".
242 242
243 - reg 243 - reg
244 Usage: required 244 Usage: required
@@ -270,8 +270,8 @@ P4080 Run Time Integrity Check (RTIC) Memory Node
270 270
271EXAMPLE 271EXAMPLE
272 rtic-a@0 { 272 rtic-a@0 {
273 compatible = "fsl,p4080-sec4.0-rtic-memory", 273 compatible = "fsl,p4080-sec-v4.0-rtic-memory",
274 "fsl,sec4.0-rtic-memory"; 274 "fsl,sec-v4.0-rtic-memory";
275 reg = <0x00 0x20 0x100 0x80>; 275 reg = <0x00 0x20 0x100 0x80>;
276 fsl,liodn = <0x03c>; 276 fsl,liodn = <0x03c>;
277 fsl,rtic-region = <0x12345678 0x12345678 0x12345678>; 277 fsl,rtic-region = <0x12345678 0x12345678 0x12345678>;
@@ -288,7 +288,7 @@ P4080 Secure Non-Volatile Storage (SNVS) Node
288 - compatible 288 - compatible
289 Usage: required 289 Usage: required
290 Value type: <string> 290 Value type: <string>
291 Definition: Must include "fsl,p4080-sec4.0-mon", "fsl,sec4.0-mon". 291 Definition: Must include "fsl,p4080-sec-v4.0-mon", "fsl,sec-v4.0-mon".
292 292
293 - reg 293 - reg
294 Usage: required 294 Usage: required
@@ -315,7 +315,7 @@ P4080 Secure Non-Volatile Storage (SNVS) Node
315 315
316EXAMPLE 316EXAMPLE
317 sec_mon@314000 { 317 sec_mon@314000 {
318 compatible = "fsl,p4080-sec4.0-mon", "fsl,sec4.0-mon"; 318 compatible = "fsl,p4080-sec-v4.0-mon", "fsl,sec-v4.0-mon";
319 reg = <0x314000 0x1000>; 319 reg = <0x314000 0x1000>;
320 interrupt-parent = <&mpic>; 320 interrupt-parent = <&mpic>;
321 interrupts = <93 2>; 321 interrupts = <93 2>;
@@ -325,7 +325,7 @@ EXAMPLE
325FULL EXAMPLE 325FULL EXAMPLE
326 326
327 crypto: crypto@300000 { 327 crypto: crypto@300000 {
328 compatible = "fsl,p4080-sec4.0", "fsl,sec4.0"; 328 compatible = "fsl,p4080-sec-v4.0", "fsl,sec-v4.0";
329 #address-cells = <1>; 329 #address-cells = <1>;
330 #size-cells = <1>; 330 #size-cells = <1>;
331 reg = <0x300000 0x10000>; 331 reg = <0x300000 0x10000>;
@@ -334,73 +334,73 @@ FULL EXAMPLE
334 interrupts = <92 2>; 334 interrupts = <92 2>;
335 335
336 sec_jr0: jr@1000 { 336 sec_jr0: jr@1000 {
337 compatible = "fsl,p4080-sec4.0-job-ring", 337 compatible = "fsl,p4080-sec-v4.0-job-ring",
338 "fsl,sec4.0-job-ring"; 338 "fsl,sec-v4.0-job-ring";
339 reg = <0x1000 0x1000>; 339 reg = <0x1000 0x1000>;
340 interrupt-parent = <&mpic>; 340 interrupt-parent = <&mpic>;
341 interrupts = <88 2>; 341 interrupts = <88 2>;
342 }; 342 };
343 343
344 sec_jr1: jr@2000 { 344 sec_jr1: jr@2000 {
345 compatible = "fsl,p4080-sec4.0-job-ring", 345 compatible = "fsl,p4080-sec-v4.0-job-ring",
346 "fsl,sec4.0-job-ring"; 346 "fsl,sec-v4.0-job-ring";
347 reg = <0x2000 0x1000>; 347 reg = <0x2000 0x1000>;
348 interrupt-parent = <&mpic>; 348 interrupt-parent = <&mpic>;
349 interrupts = <89 2>; 349 interrupts = <89 2>;
350 }; 350 };
351 351
352 sec_jr2: jr@3000 { 352 sec_jr2: jr@3000 {
353 compatible = "fsl,p4080-sec4.0-job-ring", 353 compatible = "fsl,p4080-sec-v4.0-job-ring",
354 "fsl,sec4.0-job-ring"; 354 "fsl,sec-v4.0-job-ring";
355 reg = <0x3000 0x1000>; 355 reg = <0x3000 0x1000>;
356 interrupt-parent = <&mpic>; 356 interrupt-parent = <&mpic>;
357 interrupts = <90 2>; 357 interrupts = <90 2>;
358 }; 358 };
359 359
360 sec_jr3: jr@4000 { 360 sec_jr3: jr@4000 {
361 compatible = "fsl,p4080-sec4.0-job-ring", 361 compatible = "fsl,p4080-sec-v4.0-job-ring",
362 "fsl,sec4.0-job-ring"; 362 "fsl,sec-v4.0-job-ring";
363 reg = <0x4000 0x1000>; 363 reg = <0x4000 0x1000>;
364 interrupt-parent = <&mpic>; 364 interrupt-parent = <&mpic>;
365 interrupts = <91 2>; 365 interrupts = <91 2>;
366 }; 366 };
367 367
368 rtic@6000 { 368 rtic@6000 {
369 compatible = "fsl,p4080-sec4.0-rtic", 369 compatible = "fsl,p4080-sec-v4.0-rtic",
370 "fsl,sec4.0-rtic"; 370 "fsl,sec-v4.0-rtic";
371 #address-cells = <1>; 371 #address-cells = <1>;
372 #size-cells = <1>; 372 #size-cells = <1>;
373 reg = <0x6000 0x100>; 373 reg = <0x6000 0x100>;
374 ranges = <0x0 0x6100 0xe00>; 374 ranges = <0x0 0x6100 0xe00>;
375 375
376 rtic_a: rtic-a@0 { 376 rtic_a: rtic-a@0 {
377 compatible = "fsl,p4080-sec4.0-rtic-memory", 377 compatible = "fsl,p4080-sec-v4.0-rtic-memory",
378 "fsl,sec4.0-rtic-memory"; 378 "fsl,sec-v4.0-rtic-memory";
379 reg = <0x00 0x20 0x100 0x80>; 379 reg = <0x00 0x20 0x100 0x80>;
380 }; 380 };
381 381
382 rtic_b: rtic-b@20 { 382 rtic_b: rtic-b@20 {
383 compatible = "fsl,p4080-sec4.0-rtic-memory", 383 compatible = "fsl,p4080-sec-v4.0-rtic-memory",
384 "fsl,sec4.0-rtic-memory"; 384 "fsl,sec-v4.0-rtic-memory";
385 reg = <0x20 0x20 0x200 0x80>; 385 reg = <0x20 0x20 0x200 0x80>;
386 }; 386 };
387 387
388 rtic_c: rtic-c@40 { 388 rtic_c: rtic-c@40 {
389 compatible = "fsl,p4080-sec4.0-rtic-memory", 389 compatible = "fsl,p4080-sec-v4.0-rtic-memory",
390 "fsl,sec4.0-rtic-memory"; 390 "fsl,sec-v4.0-rtic-memory";
391 reg = <0x40 0x20 0x300 0x80>; 391 reg = <0x40 0x20 0x300 0x80>;
392 }; 392 };
393 393
394 rtic_d: rtic-d@60 { 394 rtic_d: rtic-d@60 {
395 compatible = "fsl,p4080-sec4.0-rtic-memory", 395 compatible = "fsl,p4080-sec-v4.0-rtic-memory",
396 "fsl,sec4.0-rtic-memory"; 396 "fsl,sec-v4.0-rtic-memory";
397 reg = <0x60 0x20 0x500 0x80>; 397 reg = <0x60 0x20 0x500 0x80>;
398 }; 398 };
399 }; 399 };
400 }; 400 };
401 401
402 sec_mon: sec_mon@314000 { 402 sec_mon: sec_mon@314000 {
403 compatible = "fsl,p4080-sec4.0-mon", "fsl,sec4.0-mon"; 403 compatible = "fsl,p4080-sec-v4.0-mon", "fsl,sec-v4.0-mon";
404 reg = <0x314000 0x1000>; 404 reg = <0x314000 0x1000>;
405 interrupt-parent = <&mpic>; 405 interrupt-parent = <&mpic>;
406 interrupts = <93 2>; 406 interrupts = <93 2>;
diff --git a/arch/powerpc/boot/dts/p4080ds.dts b/arch/powerpc/boot/dts/p4080ds.dts
index c78e80155019..0430d241fde8 100644
--- a/arch/powerpc/boot/dts/p4080ds.dts
+++ b/arch/powerpc/boot/dts/p4080ds.dts
@@ -423,7 +423,7 @@
423 }; 423 };
424 424
425 crypto: crypto@300000 { 425 crypto: crypto@300000 {
426 compatible = "fsl,p4080-sec4.0", "fsl,sec4.0"; 426 compatible = "fsl,p4080-sec-v4.0", "fsl,sec-v4.0";
427 #address-cells = <1>; 427 #address-cells = <1>;
428 #size-cells = <1>; 428 #size-cells = <1>;
429 reg = <0x300000 0x10000>; 429 reg = <0x300000 0x10000>;
@@ -432,73 +432,74 @@
432 interrupts = <92 2>; 432 interrupts = <92 2>;
433 433
434 sec_jr0: jr@1000 { 434 sec_jr0: jr@1000 {
435 compatible = "fsl,p4080-sec4.0-job-ring", 435 compatible = "fsl,p4080-sec-v4.0-job-ring",
436 "fsl,sec4.0-job-ring"; 436 "fsl,sec-v4.0-job-ring";
437 reg = <0x1000 0x1000>; 437 reg = <0x1000 0x1000>;
438 interrupt-parent = <&mpic>; 438 interrupt-parent = <&mpic>;
439 interrupts = <88 2>; 439 interrupts = <88 2>;
440 }; 440 };
441 441
442 sec_jr1: jr@2000 { 442 sec_jr1: jr@2000 {
443 compatible = "fsl,p4080-sec4.0-job-ring", 443 compatible = "fsl,p4080-sec-v4.0-job-ring",
444 "fsl,sec4.0-job-ring"; 444 "fsl,sec-v4.0-job-ring";
445 reg = <0x2000 0x1000>; 445 reg = <0x2000 0x1000>;
446 interrupt-parent = <&mpic>; 446 interrupt-parent = <&mpic>;
447 interrupts = <89 2>; 447 interrupts = <89 2>;
448 }; 448 };
449 449
450 sec_jr2: jr@3000 { 450 sec_jr2: jr@3000 {
451 compatible = "fsl,p4080-sec4.0-job-ring", 451 compatible = "fsl,p4080-sec-v4.0-job-ring",
452 "fsl,sec4.0-job-ring"; 452 "fsl,sec-v4.0-job-ring";
453 reg = <0x3000 0x1000>; 453 reg = <0x3000 0x1000>;
454 interrupt-parent = <&mpic>; 454 interrupt-parent = <&mpic>;
455 interrupts = <90 2>; 455 interrupts = <90 2>;
456 }; 456 };
457 457
458 sec_jr3: jr@4000 { 458 sec_jr3: jr@4000 {
459 compatible = "fsl,p4080-sec4.0-job-ring", 459 compatible = "fsl,p4080-sec-v4.0-job-ring",
460 "fsl,sec4.0-job-ring"; 460 "fsl,sec-v4.0-job-ring";
461 reg = <0x4000 0x1000>; 461 reg = <0x4000 0x1000>;
462 interrupt-parent = <&mpic>; 462 interrupt-parent = <&mpic>;
463 interrupts = <91 2>; 463 interrupts = <91 2>;
464 }; 464 };
465 465
466 rtic@6000 { 466 rtic@6000 {
467 compatible = "fsl,p4080-sec4.0-rtic", 467 compatible = "fsl,p4080-sec-v4.0-rtic",
468 "fsl,sec4.0-rtic"; 468 "fsl,sec-v4.0-rtic";
469 #address-cells = <1>; 469 #address-cells = <1>;
470 #size-cells = <1>; 470 #size-cells = <1>;
471 reg = <0x6000 0x100>; 471 reg = <0x6000 0x100>;
472 ranges = <0x0 0x6100 0xe00>; 472 ranges = <0x0 0x6100 0xe00>;
473 473
474 rtic_a: rtic-a@0 { 474 rtic_a: rtic-a@0 {
475 compatible = "fsl,p4080-sec4.0-rtic-memory", 475 compatible = "fsl,p4080-sec-v4.0-rtic-memory",
476 "fsl,sec4.0-rtic-memory"; 476 "fsl,sec-v4.0-rtic-memory";
477 reg = <0x00 0x20 0x100 0x80>; 477 reg = <0x00 0x20 0x100 0x80>;
478 }; 478 };
479 479
480 rtic_b: rtic-b@20 { 480 rtic_b: rtic-b@20 {
481 compatible = "fsl,p4080-sec4.0-rtic-memory", 481 compatible = "fsl,p4080-sec-v4.0-rtic-memory",
482 "fsl,sec4.0-rtic-memory"; 482 "fsl,sec-v4.0-rtic-memory";
483 reg = <0x20 0x20 0x200 0x80>; 483 reg = <0x20 0x20 0x200 0x80>;
484 }; 484 };
485 485
486 rtic_c: rtic-c@40 { 486 rtic_c: rtic-c@40 {
487 compatible = "fsl,p4080-sec4.0-rtic-memory", 487 compatible = "fsl,p4080-sec-v4.0-rtic-memory",
488 "fsl,sec4.0-rtic-memory"; 488 "fsl,sec-v4.0-rtic-memory";
489 reg = <0x40 0x20 0x300 0x80>; 489 reg = <0x40 0x20 0x300 0x80>;
490 }; 490 };
491 491
492 rtic_d: rtic-d@60 { 492 rtic_d: rtic-d@60 {
493 compatible = "fsl,p4080-sec4.0-rtic-memory", 493 compatible = "fsl,p4080-sec-v4.0-rtic-memory",
494 "fsl,sec4.0-rtic-memory"; 494 "fsl,sec-v4.0-rtic-memory";
495 reg = <0x60 0x20 0x500 0x80>; 495 reg = <0x60 0x20 0x500 0x80>;
496 }; 496 };
497 }; 497 };
498 }; 498 };
499 499
500 sec_mon: sec_mon@314000 { 500 sec_mon: sec_mon@314000 {
501 compatible = "fsl,p4080-sec4.0-mon", "fsl,sec4.0-mon"; 501 compatible = "fsl,p4080-sec-v4.0-mon",
502 "fsl,sec-v4.0-mon";
502 reg = <0x314000 0x1000>; 503 reg = <0x314000 0x1000>;
503 interrupt-parent = <&mpic>; 504 interrupt-parent = <&mpic>;
504 interrupts = <93 2>; 505 interrupts = <93 2>;
diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index d7fe3d3d7db9..140343496096 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -1020,7 +1020,7 @@ static void __exit caam_algapi_exit(void)
1020 struct caam_crypto_alg *t_alg, *n; 1020 struct caam_crypto_alg *t_alg, *n;
1021 int i, err; 1021 int i, err;
1022 1022
1023 dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec4.0"); 1023 dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec-v4.0");
1024 if (!dev_node) 1024 if (!dev_node)
1025 return; 1025 return;
1026 1026
@@ -1094,7 +1094,7 @@ static int __init caam_algapi_init(void)
1094 struct caam_drv_private *priv; 1094 struct caam_drv_private *priv;
1095 int i = 0, err = 0; 1095 int i = 0, err = 0;
1096 1096
1097 dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec4.0"); 1097 dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec-v4.0");
1098 if (!dev_node) 1098 if (!dev_node)
1099 return -ENODEV; 1099 return -ENODEV;
1100 1100
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index aa2216160103..59aae4e3b54b 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -108,7 +108,7 @@ static int caam_probe(struct platform_device *pdev,
108 * for all, then go probe each one. 108 * for all, then go probe each one.
109 */ 109 */
110 rspec = 0; 110 rspec = 0;
111 for_each_compatible_node(np, NULL, "fsl,sec4.0-job-ring") 111 for_each_compatible_node(np, NULL, "fsl,sec-v4.0-job-ring")
112 rspec++; 112 rspec++;
113 ctrlpriv->jrdev = kzalloc(sizeof(struct device *) * rspec, GFP_KERNEL); 113 ctrlpriv->jrdev = kzalloc(sizeof(struct device *) * rspec, GFP_KERNEL);
114 if (ctrlpriv->jrdev == NULL) { 114 if (ctrlpriv->jrdev == NULL) {
@@ -118,7 +118,7 @@ static int caam_probe(struct platform_device *pdev,
118 118
119 ring = 0; 119 ring = 0;
120 ctrlpriv->total_jobrs = 0; 120 ctrlpriv->total_jobrs = 0;
121 for_each_compatible_node(np, NULL, "fsl,sec4.0-job-ring") { 121 for_each_compatible_node(np, NULL, "fsl,sec-v4.0-job-ring") {
122 caam_jr_probe(pdev, np, ring); 122 caam_jr_probe(pdev, np, ring);
123 ctrlpriv->total_jobrs++; 123 ctrlpriv->total_jobrs++;
124 ring++; 124 ring++;
@@ -236,7 +236,7 @@ static int caam_probe(struct platform_device *pdev,
236 236
237static struct of_device_id caam_match[] = { 237static struct of_device_id caam_match[] = {
238 { 238 {
239 .compatible = "fsl,sec4.0", 239 .compatible = "fsl,sec-v4.0",
240 }, 240 },
241 {}, 241 {},
242}; 242};
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-27 05:19:02 -0500