From: Peng Fan <peng.fan@nxp.com>
Date: Thu, 9 Jul 2020 08:25:45 +0000 (+0800)
Subject: soc: imx: check ls1021a
X-Git-Tag: v5.8-rc6~13^2~3^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f6e8dffc30bd22b15ad810fb90ea741c15e6d54;p=thirdparty%2Fkernel%2Flinux.git

soc: imx: check ls1021a

fsl,ls1021a is a mach under arch/arm/mach-imx/, however it could
not use the soc driver which will break caam on ls1021a platform.

So directly return if it is compatible with fsl,ls1021a.

Fixes: 52102a3ba6a61 ("soc: imx: move cpu code to drivers/soc/imx")
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Tested-by: Horia Geantă <horia.geanta@nxp.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
---

diff --git a/drivers/soc/imx/soc-imx.c b/drivers/soc/imx/soc-imx.c
index fec3d672b606a..01bfea1cb64a8 100644
--- a/drivers/soc/imx/soc-imx.c
+++ b/drivers/soc/imx/soc-imx.c
@@ -33,6 +33,9 @@ static int __init imx_soc_device_init(void)
 	u32 val;
 	int ret;
 
+	if (of_machine_is_compatible("fsl,ls1021a"))
+		return 0;
+
 	soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
 	if (!soc_dev_attr)
 		return -ENOMEM;