diff options
| author | Ye Li <ye.li@nxp.com> | 2018-10-11 23:04:07 -0700 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2018-10-11 23:44:24 -0700 |
| commit | 0ede884b92ba342725528f8e2dcc44bf5a6a7d8d (patch) | |
| tree | 4bcb7fb082458aa39f39f36d3b4332570acfba46 | |
| parent | b6ed4990f519a1ec73d38108065c7d56841ad3b0 (diff) | |
MLK-19848 mx6dq: Fix chip version issue for rev1.3
According to iMX6DQ RM, the minor field (low 8 bits) in DIGPROG is not
aligned on silicon revision 1.3. So update get_cpu_rev to correct the
revision.
0x00630002 Silicon revision 1.2
0x00630005 Silicon revision 1.3
0x00630006 Silicon revision 1.6
Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 8891410c729bfa604467440919a9709fea76e47c)
| -rw-r--r-- | arch/arm/mach-imx/mx6/soc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c index f916f58470..468259ea36 100644 --- a/arch/arm/mach-imx/mx6/soc.c +++ b/arch/arm/mach-imx/mx6/soc.c @@ -107,6 +107,11 @@ u32 get_cpu_rev(void) type = MXC_CPU_MX6DP; } reg &= 0xff; /* mx6 silicon revision */ + + /* For 6DQ, the value 0x00630005 is Silicon revision 1.3*/ + if (((type == MXC_CPU_MX6Q) || (type == MXC_CPU_MX6D)) && (reg == 0x5)) + reg = 0x3; + return (type << 12) | (reg + (0x10 * (major + 1))); } |