armv8: fsl-layerscape: guard caam specific defines

These macros should only be used when CONFIG_FSL_CAAM is present.

Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Reviewed-by: Horia Geanta <horia.geanta@nxp.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
index d9d125e8ba05f41d82369975a0f759bfd0fad1aa..9462298fbf9169114d428ba582c162ffde5419f3 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c
@@ -18,6 +18,7 @@ struct icid_id_table icid_tbl[] = {
        SET_QDMA_ICID("fsl,ls1028a-qdma", FSL_DMA_STREAM_ID),
        SET_GPU_ICID("fsl,ls1028a-gpu", FSL_GPU_STREAM_ID),
        SET_DISPLAY_ICID(FSL_DISPLAY_STREAM_ID),
+#ifdef CONFIG_FSL_CAAM
        SET_SEC_JR_ICID_ENTRY(0, FSL_SEC_JR1_STREAM_ID),
        SET_SEC_JR_ICID_ENTRY(1, FSL_SEC_JR2_STREAM_ID),
        SET_SEC_JR_ICID_ENTRY(2, FSL_SEC_JR3_STREAM_ID),
@@ -28,6 +29,7 @@ struct icid_id_table icid_tbl[] = {
        SET_SEC_RTIC_ICID_ENTRY(3, FSL_SEC_STREAM_ID),
        SET_SEC_DECO_ICID_ENTRY(0, FSL_SEC_STREAM_ID),
        SET_SEC_DECO_ICID_ENTRY(1, FSL_SEC_STREAM_ID),
+#endif
 };
 
 int icid_tbl_sz = ARRAY_SIZE(icid_tbl);

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c
index 49e27553b12f2ca71e668eb8dab1d677d60b28f0..23743ae10cffd6a824e412602c489efdcbad7542 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c
@@ -13,6 +13,7 @@ struct icid_id_table icid_tbl[] = {
        SET_USB_ICID(1, "snps,dwc3", FSL_USB1_STREAM_ID),
        SET_USB_ICID(2, "snps,dwc3", FSL_USB2_STREAM_ID),
        SET_SATA_ICID(1, "fsl,ls1088a-ahci", FSL_SATA1_STREAM_ID),
+#ifdef CONFIG_FSL_CAAM
        SET_SEC_JR_ICID_ENTRY(0, FSL_SEC_JR1_STREAM_ID),
        SET_SEC_JR_ICID_ENTRY(1, FSL_SEC_JR2_STREAM_ID),
        SET_SEC_JR_ICID_ENTRY(2, FSL_SEC_JR3_STREAM_ID),
@@ -25,6 +26,7 @@ struct icid_id_table icid_tbl[] = {
        SET_SEC_DECO_ICID_ENTRY(1, FSL_SEC_STREAM_ID),
        SET_SEC_DECO_ICID_ENTRY(2, FSL_SEC_STREAM_ID),
        SET_SEC_DECO_ICID_ENTRY(3, FSL_SEC_STREAM_ID),
+#endif
 };
 
 int icid_tbl_sz = ARRAY_SIZE(icid_tbl);