Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 2434131a7be41b19c2b6ddaa10369274ba9ffcc6

Authored by Peng Fan
Committed by Stefano Babic
1 parent 66ec590c49
Exists in smarc_8mq_lf_v2020.04 and in 9 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

imx8mn: support get_cpu_rev 

Add a dummy cpu type and support get_cpu_rev for i.MX8MN

Signed-off-by: Peng Fan <peng.fan@nxp.com>

Showing 4 changed files with 8 additions and 1 deletions Side-by-side Diff

arch/arm/include/asm/arch-imx/cpu.h
Diff comments   View file @ 2434131
... ... @@ -32,6 +32,7 @@
32 32 #define MXC_CPU_IMX8MMDL 0x88 /* dummy ID */
33 33 #define MXC_CPU_IMX8MMS 0x89 /* dummy ID */
34 34 #define MXC_CPU_IMX8MMSL 0x8a /* dummy ID */
  35 +#define MXC_CPU_IMX8MN 0x8b /* dummy ID */
35 36 #define MXC_CPU_IMX8QXP_A0 0x90 /* dummy ID */
36 37 #define MXC_CPU_IMX8QM 0x91 /* dummy ID */
37 38 #define MXC_CPU_IMX8QXP 0x92 /* dummy ID */
arch/arm/include/asm/mach-imx/sys_proto.h
Diff comments   View file @ 2434131
... ... @@ -53,6 +53,8 @@
53 53 #define is_imx8mmdl() (is_cpu_type(MXC_CPU_IMX8MMDL))
54 54 #define is_imx8mms() (is_cpu_type(MXC_CPU_IMX8MMS))
55 55 #define is_imx8mmsl() (is_cpu_type(MXC_CPU_IMX8MMSL))
  56 +#define is_imx8mn() (is_cpu_type(MXC_CPU_IMX8MN))
  57 +
56 58 #define is_imx8qxp() (is_cpu_type(MXC_CPU_IMX8QXP))
57 59  
58 60 #ifdef CONFIG_MX6
arch/arm/mach-imx/cpu.c
Diff comments   View file @ 2434131
... ... @@ -92,6 +92,8 @@
92 92 const char *get_imx_type(u32 imxtype)
93 93 {
94 94 switch (imxtype) {
  95 + case MXC_CPU_IMX8MN:
  96 + return "8MNano";/* Quad-core version of the imx8mn */
95 97 case MXC_CPU_IMX8MM:
96 98 return "8MMQ"; /* Quad-core version of the imx8mm */
97 99 case MXC_CPU_IMX8MML:
arch/arm/mach-imx/imx8m/soc.c
Diff comments   View file @ 2434131
... ... @@ -197,7 +197,9 @@
197 197 reg &= 0xff;
198 198  
199 199 /* i.MX8MM */
200   - if (major_low == 0x41) {
  200 + if (major_low == 0x42) {
  201 + return (MXC_CPU_IMX8MN << 12) | reg;
  202 + } else if (major_low == 0x41) {
201 203 type = get_cpu_variant_type(MXC_CPU_IMX8MM);
202 204 } else {
203 205 if (reg == CHIP_REV_1_0) {