diff options
| author | Ye Li <ye.li@nxp.com> | 2018-09-10 20:22:52 -0700 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2018-09-11 03:28:39 -0700 |
| commit | 58b77b541311d4b1d7db787cc769a7ad23ecbc79 (patch) | |
| tree | c74c2554d6a8aabe7b3e8225dbd080a6f52337fd | |
| parent | 6a8f5581f2b7b8be0b192f794a33a4bf6224f5fa (diff) | |
MLK-19526-1 imx8mq: Add CPU ID for iMX8MD and iMX8MQLite
iMX8MQ has two variant versions: iMX8MD and iMX8MQLite. Add dummy CPU ID
for these two, and check the fuses to get correct versions.
Signed-off-by: Ye Li <ye.li@nxp.com>
| -rw-r--r-- | arch/arm/include/asm/arch-imx/cpu.h | 5 | ||||
| -rw-r--r-- | arch/arm/include/asm/mach-imx/sys_proto.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/cpu.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx8m/soc.c | 23 |
4 files changed, 32 insertions, 4 deletions
diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h index 84817b3ac8..c3ebb6dd47 100644 --- a/arch/arm/include/asm/arch-imx/cpu.h +++ b/arch/arm/include/asm/arch-imx/cpu.h @@ -27,8 +27,9 @@ #define MXC_CPU_MX7S 0x71 /* dummy ID */ #define MXC_CPU_MX7D 0x72 #define MXC_CPU_IMX8MQ 0x82 -/* 0x83 is dummy value */ -#define MXC_CPU_IMX8MM 0x83 +#define MXC_CPU_IMX8MD 0x83 /* dummy ID */ +#define MXC_CPU_IMX8MQL 0x84 /* dummy ID */ +#define MXC_CPU_IMX8MM 0x85 /* dummy ID */ #define MXC_CPU_IMX8QM 0x91 /* dummy ID */ #define MXC_CPU_IMX8QXP 0x92 /* dummy ID */ #define MXC_CPU_IMX8DX 0x93 /* dummy ID */ diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index ef247d7621..7c1b98b99b 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -44,7 +44,9 @@ #define is_mx7ulp() (is_cpu_type(MXC_CPU_MX7ULP)) -#define is_imx8mq() (is_cpu_type(MXC_CPU_IMX8MQ)) +#define is_imx8mq() (is_cpu_type(MXC_CPU_IMX8MQ) || is_cpu_type(MXC_CPU_IMX8MD) || is_cpu_type(MXC_CPU_IMX8MQL)) +#define is_imx8md() (is_cpu_type(MXC_CPU_IMX8MD)) +#define is_imx8mql() (is_cpu_type(MXC_CPU_IMX8MQL)) #define is_imx8mm() (is_cpu_type(MXC_CPU_IMX8MM)) #define is_imx8qm() (is_cpu_type(MXC_CPU_IMX8QM)) #define is_imx8qxp() (is_cpu_type(MXC_CPU_IMX8QXP)) diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index 67db961ea6..7dc9e75a64 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -171,6 +171,10 @@ const char *get_imx_type(u32 imxtype) return "8MM"; /* Quad-core version of the imx8mm */ case MXC_CPU_IMX8MQ: return "8MQ"; /* Quad-core version of the imx8mq */ + case MXC_CPU_IMX8MQL: + return "8MQLite"; /* Quad-core Lite version of the imx8mq */ + case MXC_CPU_IMX8MD: + return "8MD"; /* Dual-core version of the imx8mq */ case MXC_CPU_MX7S: return "7S"; /* Single-core version of the mx7 */ case MXC_CPU_MX7D: diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index e1994dd3cd..3e125630e8 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -143,6 +143,25 @@ static struct mm_region imx8m_mem_map[] = { struct mm_region *mem_map = imx8m_mem_map; +static u32 get_cpu_variant_type(u32 type) +{ + if (type == MXC_CPU_IMX8MQ) { + struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR; + struct fuse_bank *bank = &ocotp->bank[1]; + struct fuse_bank1_regs *fuse = + (struct fuse_bank1_regs *)bank->fuse_regs; + + u32 value = readl(&fuse->tester4); + + if ((value & 0x3) == 0x2) + return MXC_CPU_IMX8MD; + else if (value & 0x200000) + return MXC_CPU_IMX8MQL; + } + + return type; +} + u32 get_cpu_rev(void) { struct anamix_pll *ana_pll = (struct anamix_pll *)ANATOP_BASE_ADDR; @@ -155,7 +174,7 @@ u32 get_cpu_rev(void) /* iMX8MM */ if (major_low == 0x41) { - return ((type + 1) << 12) | reg; + return (MXC_CPU_IMX8MM << 12) | reg; } else { /* iMX8MQ */ if (reg == CHIP_REV_1_0) { @@ -177,6 +196,8 @@ u32 get_cpu_rev(void) } } + type = get_cpu_variant_type(type); + return (type << 12) | reg; } } |