From: Dan Douglass <dan.douglass@freescale.com>
Date: Wed, 20 Jan 2016 19:31:56 +0000 (-0600)
Subject: MLK-12302 caam: Secure Memory platform device creation crashes
X-Git-Tag: C0P2-H0.0--20200415~3746
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=8bd2f950089c6772b9a013998f28415cb1ae80c4;p=linux.git

MLK-12302 caam: Secure Memory platform device creation crashes

There is new flag that is checked in of_platform_device_create().
The flag is cleared prior to the call now so the device creates
successfully.

Signed-off-by: Dan Douglass <dan.douglass@nxp.com>
---

diff --git a/drivers/crypto/caam/sm_store.c b/drivers/crypto/caam/sm_store.c
index 21d4d82157c1..2af1e5c61850 100644
--- a/drivers/crypto/caam/sm_store.c
+++ b/drivers/crypto/caam/sm_store.c
@@ -36,6 +36,7 @@
 #include "intern.h"
 #include "error.h"
 #include "sm.h"
+#include <linux/of_address.h>
 
 #define SECMEM_KEYMOD_LEN 8
 #define GENMEM_KEYMOD_LEN 16
@@ -1013,6 +1014,8 @@ int caam_sm_startup(struct platform_device *pdev)
 	/* Create the dev */
 #ifdef CONFIG_OF
 	np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-caam-sm");
+	if (np)
+		of_node_clear_flag(np, OF_POPULATED);
 	sm_pdev = of_platform_device_create(np, "caam_sm", ctrldev);
 #else
 	sm_pdev = platform_device_register_data(ctrldev, "caam_sm", 0,