Skip to content

Commit

Permalink
crypto: caam - add backward compatible string sec4.0
Browse files Browse the repository at this point in the history
In some device trees of previous version, there were string "fsl,sec4.0".
To be backward compatible with device trees, we first check "fsl,sec-v4.0",
if it fails, then check for "fsl,sec4.0".

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>

extended to include new hash and rng code, which was omitted from
the previous version of this patch during a rebase of the SDK
version.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
Shengzhou Liu authored and Herbert Xu committed Aug 1, 2012
1 parent 4a90507 commit 95bcaa3
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
14 changes: 10 additions & 4 deletions drivers/crypto/caam/caamhash.c
Original file line number Diff line number Diff line change
Expand Up @@ -1736,8 +1736,11 @@ static void __exit caam_algapi_hash_exit(void)
struct caam_hash_alg *t_alg, *n;

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

pdev = of_find_device_by_node(dev_node);
if (!pdev)
Expand Down Expand Up @@ -1812,8 +1815,11 @@ static int __init caam_algapi_hash_init(void)
int i = 0, err = 0;

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

pdev = of_find_device_by_node(dev_node);
if (!pdev)
Expand Down
7 changes: 5 additions & 2 deletions drivers/crypto/caam/caamrng.c
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,11 @@ static int __init caam_rng_init(void)
struct caam_drv_private *priv;

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

pdev = of_find_device_by_node(dev_node);
if (!pdev)
Expand Down

0 comments on commit 95bcaa3

Please sign in to comment.