Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95bcaa39 authored by Shengzhou Liu's avatar Shengzhou Liu Committed by Herbert Xu
Browse files

crypto: caam - add backward compatible string sec4.0 



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: default avatarShengzhou 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: default avatarKim Phillips <kim.phillips@freescale.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 4a905077

drivers/crypto/caam/caamhash.c

+10 −4
Original line number Diff line number Diff line
@@ -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) {

		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) {

		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)

drivers/crypto/caam/caamrng.c

+5 −2
Original line number Diff line number Diff line
@@ -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) {

		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)