diff options
| author | Jacky Bai <ping.bai@nxp.com> | 2020-10-27 16:20:41 +0800 |
|---|---|---|
| committer | Jacky Bai <ping.bai@nxp.com> | 2020-10-28 09:38:55 +0800 |
| commit | ccf1c54f080009827f2b8dd34ed5eb8564bab8b6 (patch) | |
| tree | 1a34ac214f44adc395f3810df9bd7aa9856d7ec2 | |
| parent | a9ecd1f1ff6d213e4f13a35aa07a69445b6a1b55 (diff) | |
MLK-24923-01: Define the IRQ_IMR_NUM for each soc of imx8m separately
As the the number of IRQ IMR register on some i.MX8M SoC is different,
define this macro in each SoC's dedicated header file.
Signed-off-by: Jacky Bai <ping.bai@nxp.com>
Reviewed-by: Anson Huang <Anson.Huang@nxp.com>
| -rw-r--r-- | plat/imx/imx8m/imx8mm/include/gpc_reg.h | 2 | ||||
| -rw-r--r-- | plat/imx/imx8m/imx8mn/include/gpc_reg.h | 2 | ||||
| -rw-r--r-- | plat/imx/imx8m/imx8mp/include/gpc_reg.h | 2 | ||||
| -rw-r--r-- | plat/imx/imx8m/imx8mq/include/gpc_reg.h | 2 | ||||
| -rw-r--r-- | plat/imx/imx8m/include/gpc.h | 1 |
5 files changed, 8 insertions, 1 deletions
diff --git a/plat/imx/imx8m/imx8mm/include/gpc_reg.h b/plat/imx/imx8m/imx8mm/include/gpc_reg.h index ab6dbf43..63b2a7a5 100644 --- a/plat/imx/imx8m/imx8mm/include/gpc_reg.h +++ b/plat/imx/imx8m/imx8mm/include/gpc_reg.h @@ -124,6 +124,8 @@ #define VPU_G2_PGC 0xf00 #define VPU_H1_PGC 0xf40 +#define IRQ_IMR_NUM 4U + #endif /* GPC_REG_H */ diff --git a/plat/imx/imx8m/imx8mn/include/gpc_reg.h b/plat/imx/imx8m/imx8mn/include/gpc_reg.h index 592c5ccc..115371fc 100644 --- a/plat/imx/imx8m/imx8mn/include/gpc_reg.h +++ b/plat/imx/imx8m/imx8mn/include/gpc_reg.h @@ -102,6 +102,8 @@ #define GPUMIX_PGC 0xdc0 #define DISPMIX_PGC 0xe80 +#define IRQ_IMR_NUM 4U + #endif /* GPC_REG_H */ diff --git a/plat/imx/imx8m/imx8mp/include/gpc_reg.h b/plat/imx/imx8m/imx8mp/include/gpc_reg.h index 66e4b920..4b44c165 100644 --- a/plat/imx/imx8m/imx8mp/include/gpc_reg.h +++ b/plat/imx/imx8m/imx8mp/include/gpc_reg.h @@ -142,4 +142,6 @@ #define MEDIAMIX_ISPDWP_PGC 0xf80 #define DDRMIX_PGC 0xfc0 +#define IRQ_IMR_NUM 5U + #endif /* GPC_REG_H */ diff --git a/plat/imx/imx8m/imx8mq/include/gpc_reg.h b/plat/imx/imx8m/imx8mq/include/gpc_reg.h index 4b099387..c9f80fdc 100644 --- a/plat/imx/imx8m/imx8mq/include/gpc_reg.h +++ b/plat/imx/imx8m/imx8mq/include/gpc_reg.h @@ -84,6 +84,8 @@ #define MASTER1_MAPPING BIT(1) #define MASTER2_MAPPING BIT(2) +#define IRQ_IMR_NUM 4U + #endif /* GPC_REG_H */ diff --git a/plat/imx/imx8m/include/gpc.h b/plat/imx/imx8m/include/gpc.h index 441c6f98..f7da5745 100644 --- a/plat/imx/imx8m/include/gpc.h +++ b/plat/imx/imx8m/include/gpc.h @@ -26,7 +26,6 @@ #define SLT_COREx_PUP(core_id) (0x2 << ((core_id) * 2)) #define SLT_COREx_PUP_ACK(core_id) ((core_id) < 2 ? (1 << ((core_id) + 16)) : (1 << ((core_id) + 27))) -#define IRQ_IMR_NUM 4 #define IMR_MASK_ALL 0xffffffff #define IMX_PD_DOMAIN(name) \ |