crypto: caam - add backward compatible string sec4.0
authorShengzhou Liu <Shengzhou.Liu@freescale.com>
Fri, 13 Jul 2012 22:49:21 +0000 (17:49 -0500)
committerHerbert Xu <herbert@gondor.apana.org.au>
Wed, 1 Aug 2012 09:47:31 +0000 (17:47 +0800)
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>
drivers/crypto/caam/caamhash.c
drivers/crypto/caam/caamrng.c

index 895aaf2bca92e85bb7bca724b9ef73afeb51af4a..dca3c1904edab57040fc5c313e581e40cfc11d10 100644 (file)
@@ -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)
index e2bfe161dece0fd433f457659c12871eff4fc706..ccedb54317e1620b6553aec96c0b7cf3198460de 100644 (file)
@@ -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)