Skip to content

Commit

Permalink
soc: imx: check ls1021a
Browse files Browse the repository at this point in the history
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: 52102a3 ("soc: imx: move cpu code to drivers/soc/imx")
Signed-off-by: Peng Fan <[email protected]>
Tested-by: Horia Geantă <[email protected]>
Reviewed-by: Fabio Estevam <[email protected]>
Signed-off-by: Shawn Guo <[email protected]>
  • Loading branch information
MrVan authored and Shawn Guo committed Jul 13, 2020
1 parent f8951dc commit 7f6e8df
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/soc/imx/soc-imx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 7f6e8df

Please sign in to comment.