diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-04 12:57:41 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-04 12:57:41 -0500 |
| commit | 73b6e6ad254b36763419cdd3fdf406c0094517b7 (patch) | |
| tree | f432e1b568809834c52389b5075815700bc68026 /arch/arm/mach-imx/imx8m/soc.c | |
| parent | 3b02d614b429442333ec3d82eef0bba527be4f8c (diff) | |
| parent | ae8a53ece0ff3b1ed686c3e0af14e59973d25db8 (diff) | |
Merge tag 'u-boot-imx-20191104' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
u-boot-imx-20191104
-------------------
- i.MX NAND: nandbcb support for MX6UL / i.MX7
- i.MX8: support for HAB
- Convert to DM (opos6ul, mccmon6)
- Toradex i.MX6ull colibri
- sync DTS with kernel
Travis : https://travis-ci.org/sbabic/u-boot-imx/builds/606853416
Diffstat (limited to 'arch/arm/mach-imx/imx8m/soc.c')
| -rw-r--r-- | arch/arm/mach-imx/imx8m/soc.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index aeca82cdbf4..a924af431c9 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -202,14 +202,21 @@ u32 get_cpu_rev(void) } else { if (reg == CHIP_REV_1_0) { /* - * For B0 chip, the DIGPROG is not updated, still TO1.0. - * we have to check ROM version further + * For B0 chip, the DIGPROG is not updated, + * it is still TO1.0. we have to check ROM + * version or OCOTP_READ_FUSE_DATA. + * 0xff0055aa is magic number for B1. */ - rom_version = readl((void __iomem *)ROM_VERSION_A0); - if (rom_version != CHIP_REV_1_0) { - rom_version = readl((void __iomem *)ROM_VERSION_B0); - if (rom_version >= CHIP_REV_2_0) - reg = CHIP_REV_2_0; + if (readl((void __iomem *)(OCOTP_BASE_ADDR + 0x40)) == 0xff0055aa) { + reg = CHIP_REV_2_1; + } else { + rom_version = + readl((void __iomem *)ROM_VERSION_A0); + if (rom_version != CHIP_REV_1_0) { + rom_version = readl((void __iomem *)ROM_VERSION_B0); + if (rom_version == CHIP_REV_2_0) + reg = CHIP_REV_2_0; + } } } } |