Commit fb9212be authored by Jacky Bai's avatar Jacky Bai Committed by Manish Pandey
Browse files

plat: imx8m: Correct the imr mask reg offset



The number of gpc imr mask reg & the offset is different
on some SOC, so correct it & replace the magic number with
macro define.
Signed-off-by: default avatarJacky Bai <ping.bai@nxp.com>
Change-Id: Ic701675cdd92e043dcd7f06722f2e871068aec74
parent 9eb1bb63
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <imx8m_psci.h> #include <imx8m_psci.h>
#include <plat_imx8.h> #include <plat_imx8.h>
static uint32_t gpc_imr_offset[] = { 0x30, 0x40, 0x1c0, 0x1d0, }; static uint32_t gpc_imr_offset[] = { IMR1_CORE0_A53, IMR1_CORE1_A53, IMR1_CORE2_A53, IMR1_CORE3_A53, };
#pragma weak imx_set_cpu_pwr_off #pragma weak imx_set_cpu_pwr_off
#pragma weak imx_set_cpu_pwr_on #pragma weak imx_set_cpu_pwr_on
......
...@@ -124,4 +124,6 @@ ...@@ -124,4 +124,6 @@
#define VPU_G2_PGC 0xf00 #define VPU_G2_PGC 0xf00
#define VPU_H1_PGC 0xf40 #define VPU_H1_PGC 0xf40
#define IRQ_IMR_NUM U(4)
#endif /* GPC_REG_H */ #endif /* GPC_REG_H */
...@@ -106,4 +106,6 @@ ...@@ -106,4 +106,6 @@
#define GPUMIX_PGC 0xdc0 #define GPUMIX_PGC 0xdc0
#define DISPMIX_PGC 0xe80 #define DISPMIX_PGC 0xe80
#define IRQ_IMR_NUM U(4)
#endif /* GPC_REG_H */ #endif /* GPC_REG_H */
...@@ -146,4 +146,6 @@ ...@@ -146,4 +146,6 @@
#define MEDIAMIX_ISPDWP_PGC 0xf80 #define MEDIAMIX_ISPDWP_PGC 0xf80
#define DDRMIX_PGC 0xfc0 #define DDRMIX_PGC 0xfc0
#define IRQ_IMR_NUM U(5)
#endif /* GPC_REG_H */ #endif /* GPC_REG_H */
...@@ -84,4 +84,6 @@ ...@@ -84,4 +84,6 @@
#define MASTER1_MAPPING BIT(1) #define MASTER1_MAPPING BIT(1)
#define MASTER2_MAPPING BIT(2) #define MASTER2_MAPPING BIT(2)
#define IRQ_IMR_NUM U(4)
#endif /* GPC_REG_H */ #endif /* GPC_REG_H */
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#define SLTx_CFG(n) ((SLT0_CFG + ((n) * 4))) #define SLTx_CFG(n) ((SLT0_CFG + ((n) * 4)))
#define SLT_COREx_PUP(core_id) (0x2 << ((core_id) * 2)) #define SLT_COREx_PUP(core_id) (0x2 << ((core_id) * 2))
#define IRQ_IMR_NUM 4
#define IMR_MASK_ALL 0xffffffff #define IMR_MASK_ALL 0xffffffff
#define IMX_PD_DOMAIN(name, on) \ #define IMX_PD_DOMAIN(name, on) \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment