aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/crypto
diff options
context:
space:
mode:
authorKim Phillips <kim.phillips@freescale.com>2011-03-23 09:15:44 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2011-03-26 22:45:17 -0400
commit54e198d4c162b36ba864ecc658c829454074523f (patch)
tree8a919e4261ce39b34dffbd8d82eb234b8986f17a /drivers/crypto
parent8e8ec596e6c0144e2dd500a57ee23dde9684df46 (diff)
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: Kim Phillips <kim.phillips@freescale.com> Cc: Kumar Gala <kumar.gala@freescale.com> Cc: Steve Cornelius <sec@pobox.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/caam/caamalg.c4
-rw-r--r--drivers/crypto/caam/ctrl.c6
2 files changed, 5 insertions, 5 deletions
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};