Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 247764
b: refs/heads/master
c: 54e198d
h: refs/heads/master
v: v3
  • Loading branch information
Kim Phillips authored and Herbert Xu committed Mar 27, 2011
1 parent dbc0799 commit ec8b929
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 60 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8e8ec596e6c0144e2dd500a57ee23dde9684df46
refs/heads/master: 54e198d4c162b36ba864ecc658c829454074523f
68 changes: 34 additions & 34 deletions trunk/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ PROPERTIES
- compatible
Usage: required
Value type: <string>
Definition: Must include "fsl,p4080-sec4.0","fsl,sec-4.0"
Definition: Must include "fsl,p4080-sec-v4.0","fsl,sec-v4.0"

- #address-cells
Usage: required
Expand All @@ -72,7 +72,7 @@ PROPERTIES
Usage: required
Value type: <prop-encoded-array>
Definition: A standard property. Specifies the physical
address and length of the SEC4.0 configuration registers.
address and length of the SEC4 configuration registers.
registers

- ranges
Expand Down Expand Up @@ -105,7 +105,7 @@ PROPERTIES

EXAMPLE
crypto@300000 {
compatible = "fsl,p4080-sec4.0", "fsl,sec4.0";
compatible = "fsl,p4080-sec-v4.0", "fsl,sec-v4.0";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x300000 0x10000>;
Expand All @@ -127,7 +127,7 @@ P4080 Job Ring (JR) Node
- compatible
Usage: required
Value type: <string>
Definition: Must include "fsl,p4080-sec4.0-job-ring","fsl,sec4.0-job-ring"
Definition: Must include "fsl,p4080-sec-v4.0-job-ring","fsl,sec-v4.0-job-ring"

- reg
Usage: required
Expand Down Expand Up @@ -163,8 +163,8 @@ P4080 Job Ring (JR) Node

EXAMPLE
jr@1000 {
compatible = "fsl,p4080-sec4.0-job-ring",
"fsl,sec4.0-job-ring";
compatible = "fsl,p4080-sec-v4.0-job-ring",
"fsl,sec-v4.0-job-ring";
reg = <0x1000 0x1000>;
fsl,liodn = <0x081>;
interrupt-parent = <&mpic>;
Expand All @@ -186,7 +186,7 @@ P4080 Run Time Integrity Check (RTIC) Node
- compatible
Usage: required
Value type: <string>
Definition: Must include "fsl,p4080-sec4.0-rtic","fsl,sec4.0-rtic".
Definition: Must include "fsl,p4080-sec-v4.0-rtic","fsl,sec-v4.0-rtic".

- #address-cells
Usage: required
Expand Down Expand Up @@ -219,8 +219,8 @@ P4080 Run Time Integrity Check (RTIC) Node

EXAMPLE
rtic@6000 {
compatible = "fsl,p4080-sec4.0-rtic",
"fsl,sec4.0-rtic";
compatible = "fsl,p4080-sec-v4.0-rtic",
"fsl,sec-v4.0-rtic";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x6000 0x100>;
Expand All @@ -238,7 +238,7 @@ P4080 Run Time Integrity Check (RTIC) Memory Node
- compatible
Usage: required
Value type: <string>
Definition: Must include "fsl,p4080-sec4.0-rtic-memory","fsl,sec4.0-rtic-memory".
Definition: Must include "fsl,p4080-sec-v4.0-rtic-memory","fsl,sec-v4.0-rtic-memory".

- reg
Usage: required
Expand Down Expand Up @@ -270,8 +270,8 @@ P4080 Run Time Integrity Check (RTIC) Memory Node

EXAMPLE
rtic-a@0 {
compatible = "fsl,p4080-sec4.0-rtic-memory",
"fsl,sec4.0-rtic-memory";
compatible = "fsl,p4080-sec-v4.0-rtic-memory",
"fsl,sec-v4.0-rtic-memory";
reg = <0x00 0x20 0x100 0x80>;
fsl,liodn = <0x03c>;
fsl,rtic-region = <0x12345678 0x12345678 0x12345678>;
Expand All @@ -288,7 +288,7 @@ P4080 Secure Non-Volatile Storage (SNVS) Node
- compatible
Usage: required
Value type: <string>
Definition: Must include "fsl,p4080-sec4.0-mon", "fsl,sec4.0-mon".
Definition: Must include "fsl,p4080-sec-v4.0-mon", "fsl,sec-v4.0-mon".

- reg
Usage: required
Expand All @@ -315,7 +315,7 @@ P4080 Secure Non-Volatile Storage (SNVS) Node

EXAMPLE
sec_mon@314000 {
compatible = "fsl,p4080-sec4.0-mon", "fsl,sec4.0-mon";
compatible = "fsl,p4080-sec-v4.0-mon", "fsl,sec-v4.0-mon";
reg = <0x314000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <93 2>;
Expand All @@ -325,7 +325,7 @@ EXAMPLE
FULL EXAMPLE

crypto: crypto@300000 {
compatible = "fsl,p4080-sec4.0", "fsl,sec4.0";
compatible = "fsl,p4080-sec-v4.0", "fsl,sec-v4.0";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x300000 0x10000>;
Expand All @@ -334,73 +334,73 @@ FULL EXAMPLE
interrupts = <92 2>;

sec_jr0: jr@1000 {
compatible = "fsl,p4080-sec4.0-job-ring",
"fsl,sec4.0-job-ring";
compatible = "fsl,p4080-sec-v4.0-job-ring",
"fsl,sec-v4.0-job-ring";
reg = <0x1000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <88 2>;
};

sec_jr1: jr@2000 {
compatible = "fsl,p4080-sec4.0-job-ring",
"fsl,sec4.0-job-ring";
compatible = "fsl,p4080-sec-v4.0-job-ring",
"fsl,sec-v4.0-job-ring";
reg = <0x2000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <89 2>;
};

sec_jr2: jr@3000 {
compatible = "fsl,p4080-sec4.0-job-ring",
"fsl,sec4.0-job-ring";
compatible = "fsl,p4080-sec-v4.0-job-ring",
"fsl,sec-v4.0-job-ring";
reg = <0x3000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <90 2>;
};

sec_jr3: jr@4000 {
compatible = "fsl,p4080-sec4.0-job-ring",
"fsl,sec4.0-job-ring";
compatible = "fsl,p4080-sec-v4.0-job-ring",
"fsl,sec-v4.0-job-ring";
reg = <0x4000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <91 2>;
};

rtic@6000 {
compatible = "fsl,p4080-sec4.0-rtic",
"fsl,sec4.0-rtic";
compatible = "fsl,p4080-sec-v4.0-rtic",
"fsl,sec-v4.0-rtic";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x6000 0x100>;
ranges = <0x0 0x6100 0xe00>;

rtic_a: rtic-a@0 {
compatible = "fsl,p4080-sec4.0-rtic-memory",
"fsl,sec4.0-rtic-memory";
compatible = "fsl,p4080-sec-v4.0-rtic-memory",
"fsl,sec-v4.0-rtic-memory";
reg = <0x00 0x20 0x100 0x80>;
};

rtic_b: rtic-b@20 {
compatible = "fsl,p4080-sec4.0-rtic-memory",
"fsl,sec4.0-rtic-memory";
compatible = "fsl,p4080-sec-v4.0-rtic-memory",
"fsl,sec-v4.0-rtic-memory";
reg = <0x20 0x20 0x200 0x80>;
};

rtic_c: rtic-c@40 {
compatible = "fsl,p4080-sec4.0-rtic-memory",
"fsl,sec4.0-rtic-memory";
compatible = "fsl,p4080-sec-v4.0-rtic-memory",
"fsl,sec-v4.0-rtic-memory";
reg = <0x40 0x20 0x300 0x80>;
};

rtic_d: rtic-d@60 {
compatible = "fsl,p4080-sec4.0-rtic-memory",
"fsl,sec4.0-rtic-memory";
compatible = "fsl,p4080-sec-v4.0-rtic-memory",
"fsl,sec-v4.0-rtic-memory";
reg = <0x60 0x20 0x500 0x80>;
};
};
};

sec_mon: sec_mon@314000 {
compatible = "fsl,p4080-sec4.0-mon", "fsl,sec4.0-mon";
compatible = "fsl,p4080-sec-v4.0-mon", "fsl,sec-v4.0-mon";
reg = <0x314000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <93 2>;
Expand Down
41 changes: 21 additions & 20 deletions trunk/arch/powerpc/boot/dts/p4080ds.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@
};

crypto: crypto@300000 {
compatible = "fsl,p4080-sec4.0", "fsl,sec4.0";
compatible = "fsl,p4080-sec-v4.0", "fsl,sec-v4.0";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x300000 0x10000>;
Expand All @@ -432,73 +432,74 @@
interrupts = <92 2>;

sec_jr0: jr@1000 {
compatible = "fsl,p4080-sec4.0-job-ring",
"fsl,sec4.0-job-ring";
compatible = "fsl,p4080-sec-v4.0-job-ring",
"fsl,sec-v4.0-job-ring";
reg = <0x1000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <88 2>;
};

sec_jr1: jr@2000 {
compatible = "fsl,p4080-sec4.0-job-ring",
"fsl,sec4.0-job-ring";
compatible = "fsl,p4080-sec-v4.0-job-ring",
"fsl,sec-v4.0-job-ring";
reg = <0x2000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <89 2>;
};

sec_jr2: jr@3000 {
compatible = "fsl,p4080-sec4.0-job-ring",
"fsl,sec4.0-job-ring";
compatible = "fsl,p4080-sec-v4.0-job-ring",
"fsl,sec-v4.0-job-ring";
reg = <0x3000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <90 2>;
};

sec_jr3: jr@4000 {
compatible = "fsl,p4080-sec4.0-job-ring",
"fsl,sec4.0-job-ring";
compatible = "fsl,p4080-sec-v4.0-job-ring",
"fsl,sec-v4.0-job-ring";
reg = <0x4000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <91 2>;
};

rtic@6000 {
compatible = "fsl,p4080-sec4.0-rtic",
"fsl,sec4.0-rtic";
compatible = "fsl,p4080-sec-v4.0-rtic",
"fsl,sec-v4.0-rtic";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x6000 0x100>;
ranges = <0x0 0x6100 0xe00>;

rtic_a: rtic-a@0 {
compatible = "fsl,p4080-sec4.0-rtic-memory",
"fsl,sec4.0-rtic-memory";
compatible = "fsl,p4080-sec-v4.0-rtic-memory",
"fsl,sec-v4.0-rtic-memory";
reg = <0x00 0x20 0x100 0x80>;
};

rtic_b: rtic-b@20 {
compatible = "fsl,p4080-sec4.0-rtic-memory",
"fsl,sec4.0-rtic-memory";
compatible = "fsl,p4080-sec-v4.0-rtic-memory",
"fsl,sec-v4.0-rtic-memory";
reg = <0x20 0x20 0x200 0x80>;
};

rtic_c: rtic-c@40 {
compatible = "fsl,p4080-sec4.0-rtic-memory",
"fsl,sec4.0-rtic-memory";
compatible = "fsl,p4080-sec-v4.0-rtic-memory",
"fsl,sec-v4.0-rtic-memory";
reg = <0x40 0x20 0x300 0x80>;
};

rtic_d: rtic-d@60 {
compatible = "fsl,p4080-sec4.0-rtic-memory",
"fsl,sec4.0-rtic-memory";
compatible = "fsl,p4080-sec-v4.0-rtic-memory",
"fsl,sec-v4.0-rtic-memory";
reg = <0x60 0x20 0x500 0x80>;
};
};
};

sec_mon: sec_mon@314000 {
compatible = "fsl,p4080-sec4.0-mon", "fsl,sec4.0-mon";
compatible = "fsl,p4080-sec-v4.0-mon",
"fsl,sec-v4.0-mon";
reg = <0x314000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <93 2>;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/crypto/caam/caamalg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,7 @@ static void __exit caam_algapi_exit(void)
struct caam_crypto_alg *t_alg, *n;
int i, err;

dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec4.0");
dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec-v4.0");
if (!dev_node)
return;

Expand Down Expand Up @@ -1094,7 +1094,7 @@ static int __init caam_algapi_init(void)
struct caam_drv_private *priv;
int i = 0, err = 0;

dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec4.0");
dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec-v4.0");
if (!dev_node)
return -ENODEV;

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/crypto/caam/ctrl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ static int caam_probe(struct platform_device *pdev,
* for all, then go probe each one.
*/
rspec = 0;
for_each_compatible_node(np, NULL, "fsl,sec4.0-job-ring")
for_each_compatible_node(np, NULL, "fsl,sec-v4.0-job-ring")
rspec++;
ctrlpriv->jrdev = kzalloc(sizeof(struct device *) * rspec, GFP_KERNEL);
if (ctrlpriv->jrdev == NULL) {
Expand All @@ -118,7 +118,7 @@ static int caam_probe(struct platform_device *pdev,

ring = 0;
ctrlpriv->total_jobrs = 0;
for_each_compatible_node(np, NULL, "fsl,sec4.0-job-ring") {
for_each_compatible_node(np, NULL, "fsl,sec-v4.0-job-ring") {
caam_jr_probe(pdev, np, ring);
ctrlpriv->total_jobrs++;
ring++;
Expand Down Expand Up @@ -236,7 +236,7 @@ static int caam_probe(struct platform_device *pdev,

static struct of_device_id caam_match[] = {
{
.compatible = "fsl,sec4.0",
.compatible = "fsl,sec-v4.0",
},
{},
};
Expand Down

0 comments on commit ec8b929

Please sign in to comment.