Skip to content

L
linux
Commit 54e198d4 authored by Kim Phillips's avatar Kim Phillips Committed by Herbert Xu
Browse files
Options

crypto: caam - standardize device tree naming convention to utilize '-vX.Y' 

Help clarify that the number trailing in compatible nomenclature
is the version number of the device, i.e., change:

"fsl,p4080-sec4.0", "fsl,sec4.0";

to:

"fsl,p4080-sec-v4.0", "fsl,sec-v4.0";
Signed-off-by: default avatarKim Phillips <kim.phillips@freescale.com>
Cc: Kumar Gala <kumar.gala@freescale.com>
Cc: Steve Cornelius <sec@pobox.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 8e8ec596
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 59 deletions
Documentation/devicetree/bindings/crypto/fsl-sec4.txt
View file @ 54e198d4
...@@ -53,7 +53,7 @@ PROPERTIES ...@@ -53,7 +53,7 @@ PROPERTIES
- compatible - compatible
Usage: required Usage: required
Value type: <string> 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 - #address-cells
Usage: required Usage: required
...@@ -72,7 +72,7 @@ PROPERTIES ...@@ -72,7 +72,7 @@ PROPERTIES
Usage: required Usage: required
Value type: <prop-encoded-array> Value type: <prop-encoded-array>
Definition: A standard property. Specifies the physical 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 registers
- ranges - ranges
...@@ -105,7 +105,7 @@ PROPERTIES ...@@ -105,7 +105,7 @@ PROPERTIES
EXAMPLE EXAMPLE
crypto@300000 { crypto@300000 {
compatible = "fsl,p4080-sec4.0", "fsl,sec4.0"; compatible = "fsl,p4080-sec-v4.0", "fsl,sec-v4.0";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
reg = <0x300000 0x10000>; reg = <0x300000 0x10000>;
...@@ -127,7 +127,7 @@ P4080 Job Ring (JR) Node ...@@ -127,7 +127,7 @@ P4080 Job Ring (JR) Node
- compatible - compatible
Usage: required Usage: required
Value type: <string> 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 - reg
Usage: required Usage: required
...@@ -163,8 +163,8 @@ P4080 Job Ring (JR) Node ...@@ -163,8 +163,8 @@ P4080 Job Ring (JR) Node
EXAMPLE EXAMPLE
jr@1000 { jr@1000 {
compatible = "fsl,p4080-sec4.0-job-ring", compatible = "fsl,p4080-sec-v4.0-job-ring",
"fsl,sec4.0-job-ring"; "fsl,sec-v4.0-job-ring";
reg = <0x1000 0x1000>; reg = <0x1000 0x1000>;
fsl,liodn = <0x081>; fsl,liodn = <0x081>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
...@@ -186,7 +186,7 @@ P4080 Run Time Integrity Check (RTIC) Node ...@@ -186,7 +186,7 @@ P4080 Run Time Integrity Check (RTIC) Node
- compatible - compatible
Usage: required Usage: required
Value type: <string> 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 - #address-cells
Usage: required Usage: required
...@@ -219,8 +219,8 @@ P4080 Run Time Integrity Check (RTIC) Node ...@@ -219,8 +219,8 @@ P4080 Run Time Integrity Check (RTIC) Node
EXAMPLE EXAMPLE
rtic@6000 { rtic@6000 {
compatible = "fsl,p4080-sec4.0-rtic", compatible = "fsl,p4080-sec-v4.0-rtic",
"fsl,sec4.0-rtic"; "fsl,sec-v4.0-rtic";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
reg = <0x6000 0x100>; reg = <0x6000 0x100>;
...@@ -238,7 +238,7 @@ P4080 Run Time Integrity Check (RTIC) Memory Node ...@@ -238,7 +238,7 @@ P4080 Run Time Integrity Check (RTIC) Memory Node
- compatible - compatible
Usage: required Usage: required
Value type: <string> 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 - reg
Usage: required Usage: required
...@@ -270,8 +270,8 @@ P4080 Run Time Integrity Check (RTIC) Memory Node ...@@ -270,8 +270,8 @@ P4080 Run Time Integrity Check (RTIC) Memory Node
EXAMPLE EXAMPLE
rtic-a@0 { rtic-a@0 {
compatible = "fsl,p4080-sec4.0-rtic-memory", compatible = "fsl,p4080-sec-v4.0-rtic-memory",
"fsl,sec4.0-rtic-memory"; "fsl,sec-v4.0-rtic-memory";
reg = <0x00 0x20 0x100 0x80>; reg = <0x00 0x20 0x100 0x80>;
fsl,liodn = <0x03c>; fsl,liodn = <0x03c>;
fsl,rtic-region = <0x12345678 0x12345678 0x12345678>; fsl,rtic-region = <0x12345678 0x12345678 0x12345678>;
...@@ -288,7 +288,7 @@ P4080 Secure Non-Volatile Storage (SNVS) Node ...@@ -288,7 +288,7 @@ P4080 Secure Non-Volatile Storage (SNVS) Node
- compatible - compatible
Usage: required Usage: required
Value type: <string> 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 - reg
Usage: required Usage: required
...@@ -315,7 +315,7 @@ P4080 Secure Non-Volatile Storage (SNVS) Node ...@@ -315,7 +315,7 @@ P4080 Secure Non-Volatile Storage (SNVS) Node
EXAMPLE EXAMPLE
sec_mon@314000 { 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>; reg = <0x314000 0x1000>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <93 2>; interrupts = <93 2>;
...@@ -325,7 +325,7 @@ EXAMPLE ...@@ -325,7 +325,7 @@ EXAMPLE
FULL EXAMPLE FULL EXAMPLE
crypto: crypto@300000 { crypto: crypto@300000 {
compatible = "fsl,p4080-sec4.0", "fsl,sec4.0"; compatible = "fsl,p4080-sec-v4.0", "fsl,sec-v4.0";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
reg = <0x300000 0x10000>; reg = <0x300000 0x10000>;
...@@ -334,73 +334,73 @@ FULL EXAMPLE ...@@ -334,73 +334,73 @@ FULL EXAMPLE
interrupts = <92 2>; interrupts = <92 2>;
sec_jr0: jr@1000 { sec_jr0: jr@1000 {
compatible = "fsl,p4080-sec4.0-job-ring", compatible = "fsl,p4080-sec-v4.0-job-ring",
"fsl,sec4.0-job-ring"; "fsl,sec-v4.0-job-ring";
reg = <0x1000 0x1000>; reg = <0x1000 0x1000>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <88 2>; interrupts = <88 2>;
}; };
sec_jr1: jr@2000 { sec_jr1: jr@2000 {
compatible = "fsl,p4080-sec4.0-job-ring", compatible = "fsl,p4080-sec-v4.0-job-ring",
"fsl,sec4.0-job-ring"; "fsl,sec-v4.0-job-ring";
reg = <0x2000 0x1000>; reg = <0x2000 0x1000>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <89 2>; interrupts = <89 2>;
}; };
sec_jr2: jr@3000 { sec_jr2: jr@3000 {
compatible = "fsl,p4080-sec4.0-job-ring", compatible = "fsl,p4080-sec-v4.0-job-ring",
"fsl,sec4.0-job-ring"; "fsl,sec-v4.0-job-ring";
reg = <0x3000 0x1000>; reg = <0x3000 0x1000>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <90 2>; interrupts = <90 2>;
}; };
sec_jr3: jr@4000 { sec_jr3: jr@4000 {
compatible = "fsl,p4080-sec4.0-job-ring", compatible = "fsl,p4080-sec-v4.0-job-ring",
"fsl,sec4.0-job-ring"; "fsl,sec-v4.0-job-ring";
reg = <0x4000 0x1000>; reg = <0x4000 0x1000>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <91 2>; interrupts = <91 2>;
}; };
rtic@6000 { rtic@6000 {
compatible = "fsl,p4080-sec4.0-rtic", compatible = "fsl,p4080-sec-v4.0-rtic",
"fsl,sec4.0-rtic"; "fsl,sec-v4.0-rtic";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
reg = <0x6000 0x100>; reg = <0x6000 0x100>;
ranges = <0x0 0x6100 0xe00>; ranges = <0x0 0x6100 0xe00>;
rtic_a: rtic-a@0 { rtic_a: rtic-a@0 {
compatible = "fsl,p4080-sec4.0-rtic-memory", compatible = "fsl,p4080-sec-v4.0-rtic-memory",
"fsl,sec4.0-rtic-memory"; "fsl,sec-v4.0-rtic-memory";
reg = <0x00 0x20 0x100 0x80>; reg = <0x00 0x20 0x100 0x80>;
}; };
rtic_b: rtic-b@20 { rtic_b: rtic-b@20 {
compatible = "fsl,p4080-sec4.0-rtic-memory", compatible = "fsl,p4080-sec-v4.0-rtic-memory",
"fsl,sec4.0-rtic-memory"; "fsl,sec-v4.0-rtic-memory";
reg = <0x20 0x20 0x200 0x80>; reg = <0x20 0x20 0x200 0x80>;
}; };
rtic_c: rtic-c@40 { rtic_c: rtic-c@40 {
compatible = "fsl,p4080-sec4.0-rtic-memory", compatible = "fsl,p4080-sec-v4.0-rtic-memory",
"fsl,sec4.0-rtic-memory"; "fsl,sec-v4.0-rtic-memory";
reg = <0x40 0x20 0x300 0x80>; reg = <0x40 0x20 0x300 0x80>;
}; };
rtic_d: rtic-d@60 { rtic_d: rtic-d@60 {
compatible = "fsl,p4080-sec4.0-rtic-memory", compatible = "fsl,p4080-sec-v4.0-rtic-memory",
"fsl,sec4.0-rtic-memory"; "fsl,sec-v4.0-rtic-memory";
reg = <0x60 0x20 0x500 0x80>; reg = <0x60 0x20 0x500 0x80>;
}; };
}; };
}; };
sec_mon: sec_mon@314000 { 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>; reg = <0x314000 0x1000>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <93 2>; interrupts = <93 2>;
......
arch/powerpc/boot/dts/p4080ds.dts
View file @ 54e198d4
...@@ -423,7 +423,7 @@ usb1: usb@211000 { ...@@ -423,7 +423,7 @@ usb1: usb@211000 {
}; };
crypto: crypto@300000 { crypto: crypto@300000 {
compatible = "fsl,p4080-sec4.0", "fsl,sec4.0"; compatible = "fsl,p4080-sec-v4.0", "fsl,sec-v4.0";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
reg = <0x300000 0x10000>; reg = <0x300000 0x10000>;
...@@ -432,73 +432,74 @@ crypto: crypto@300000 { ...@@ -432,73 +432,74 @@ crypto: crypto@300000 {
interrupts = <92 2>; interrupts = <92 2>;
sec_jr0: jr@1000 { sec_jr0: jr@1000 {
compatible = "fsl,p4080-sec4.0-job-ring", compatible = "fsl,p4080-sec-v4.0-job-ring",
"fsl,sec4.0-job-ring"; "fsl,sec-v4.0-job-ring";
reg = <0x1000 0x1000>; reg = <0x1000 0x1000>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <88 2>; interrupts = <88 2>;
}; };
sec_jr1: jr@2000 { sec_jr1: jr@2000 {
compatible = "fsl,p4080-sec4.0-job-ring", compatible = "fsl,p4080-sec-v4.0-job-ring",
"fsl,sec4.0-job-ring"; "fsl,sec-v4.0-job-ring";
reg = <0x2000 0x1000>; reg = <0x2000 0x1000>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <89 2>; interrupts = <89 2>;
}; };
sec_jr2: jr@3000 { sec_jr2: jr@3000 {
compatible = "fsl,p4080-sec4.0-job-ring", compatible = "fsl,p4080-sec-v4.0-job-ring",
"fsl,sec4.0-job-ring"; "fsl,sec-v4.0-job-ring";
reg = <0x3000 0x1000>; reg = <0x3000 0x1000>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <90 2>; interrupts = <90 2>;
}; };
sec_jr3: jr@4000 { sec_jr3: jr@4000 {
compatible = "fsl,p4080-sec4.0-job-ring", compatible = "fsl,p4080-sec-v4.0-job-ring",
"fsl,sec4.0-job-ring"; "fsl,sec-v4.0-job-ring";
reg = <0x4000 0x1000>; reg = <0x4000 0x1000>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <91 2>; interrupts = <91 2>;
}; };
rtic@6000 { rtic@6000 {
compatible = "fsl,p4080-sec4.0-rtic", compatible = "fsl,p4080-sec-v4.0-rtic",
"fsl,sec4.0-rtic"; "fsl,sec-v4.0-rtic";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
reg = <0x6000 0x100>; reg = <0x6000 0x100>;
ranges = <0x0 0x6100 0xe00>; ranges = <0x0 0x6100 0xe00>;
rtic_a: rtic-a@0 { rtic_a: rtic-a@0 {
compatible = "fsl,p4080-sec4.0-rtic-memory", compatible = "fsl,p4080-sec-v4.0-rtic-memory",
"fsl,sec4.0-rtic-memory"; "fsl,sec-v4.0-rtic-memory";
reg = <0x00 0x20 0x100 0x80>; reg = <0x00 0x20 0x100 0x80>;
}; };
rtic_b: rtic-b@20 { rtic_b: rtic-b@20 {
compatible = "fsl,p4080-sec4.0-rtic-memory", compatible = "fsl,p4080-sec-v4.0-rtic-memory",
"fsl,sec4.0-rtic-memory"; "fsl,sec-v4.0-rtic-memory";
reg = <0x20 0x20 0x200 0x80>; reg = <0x20 0x20 0x200 0x80>;
}; };
rtic_c: rtic-c@40 { rtic_c: rtic-c@40 {
compatible = "fsl,p4080-sec4.0-rtic-memory", compatible = "fsl,p4080-sec-v4.0-rtic-memory",
"fsl,sec4.0-rtic-memory"; "fsl,sec-v4.0-rtic-memory";
reg = <0x40 0x20 0x300 0x80>; reg = <0x40 0x20 0x300 0x80>;
}; };
rtic_d: rtic-d@60 { rtic_d: rtic-d@60 {
compatible = "fsl,p4080-sec4.0-rtic-memory", compatible = "fsl,p4080-sec-v4.0-rtic-memory",
"fsl,sec4.0-rtic-memory"; "fsl,sec-v4.0-rtic-memory";
reg = <0x60 0x20 0x500 0x80>; reg = <0x60 0x20 0x500 0x80>;
}; };
}; };
}; };
sec_mon: sec_mon@314000 { 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>; reg = <0x314000 0x1000>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <93 2>; interrupts = <93 2>;
......
drivers/crypto/caam/caamalg.c
View file @ 54e198d4
...@@ -1020,7 +1020,7 @@ static void __exit caam_algapi_exit(void) ...@@ -1020,7 +1020,7 @@ static void __exit caam_algapi_exit(void)
struct caam_crypto_alg *t_alg, *n; struct caam_crypto_alg *t_alg, *n;
int i, err; 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) if (!dev_node)
return; return;
...@@ -1094,7 +1094,7 @@ static int __init caam_algapi_init(void) ...@@ -1094,7 +1094,7 @@ static int __init caam_algapi_init(void)
struct caam_drv_private *priv; struct caam_drv_private *priv;
int i = 0, err = 0; 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) if (!dev_node)
return -ENODEV; return -ENODEV;
......
drivers/crypto/caam/ctrl.c
View file @ 54e198d4
...@@ -108,7 +108,7 @@ static int caam_probe(struct platform_device *pdev, ...@@ -108,7 +108,7 @@ static int caam_probe(struct platform_device *pdev,
* for all, then go probe each one. * for all, then go probe each one.
*/ */
rspec = 0; 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++; rspec++;
ctrlpriv->jrdev = kzalloc(sizeof(struct device *) * rspec, GFP_KERNEL); ctrlpriv->jrdev = kzalloc(sizeof(struct device *) * rspec, GFP_KERNEL);
if (ctrlpriv->jrdev == NULL) { if (ctrlpriv->jrdev == NULL) {
...@@ -118,7 +118,7 @@ static int caam_probe(struct platform_device *pdev, ...@@ -118,7 +118,7 @@ static int caam_probe(struct platform_device *pdev,
ring = 0; ring = 0;
ctrlpriv->total_jobrs = 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); caam_jr_probe(pdev, np, ring);
ctrlpriv->total_jobrs++; ctrlpriv->total_jobrs++;
ring++; ring++;
...@@ -236,7 +236,7 @@ static int caam_probe(struct platform_device *pdev, ...@@ -236,7 +236,7 @@ static int caam_probe(struct platform_device *pdev,
static struct of_device_id caam_match[] = { static struct of_device_id caam_match[] = {
{ {
.compatible = "fsl,sec4.0", .compatible = "fsl,sec-v4.0",
}, },
{}, {},
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7