From 777d09d8af79b337ead5004162bff6eb9f873bdd Mon Sep 17 00:00:00 2001 From: Shengzhou Liu Date: Fri, 13 Jul 2012 17:49:21 -0500 Subject: [PATCH] --- yaml --- r: 329716 b: refs/heads/master c: 95bcaa39053ff518021572ca00ebf626ee8cbaf8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/crypto/caam/caamhash.c | 14 ++++++++++---- trunk/drivers/crypto/caam/caamrng.c | 7 +++++-- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 1d9383e9d33f..63c2ace4dae7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a905077134849ea30d1c6dbf4071ea9e8e71b93 +refs/heads/master: 95bcaa39053ff518021572ca00ebf626ee8cbaf8 diff --git a/trunk/drivers/crypto/caam/caamhash.c b/trunk/drivers/crypto/caam/caamhash.c index 895aaf2bca92..dca3c1904eda 100644 --- a/trunk/drivers/crypto/caam/caamhash.c +++ b/trunk/drivers/crypto/caam/caamhash.c @@ -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) @@ -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) diff --git a/trunk/drivers/crypto/caam/caamrng.c b/trunk/drivers/crypto/caam/caamrng.c index e2bfe161dece..ccedb54317e1 100644 --- a/trunk/drivers/crypto/caam/caamrng.c +++ b/trunk/drivers/crypto/caam/caamrng.c @@ -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)