diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2019-02-11 18:27:47 -0800 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-12 21:27:30 +0100 |
| commit | 13f7692867a2446d8d24e7e7797417bdb6a7511c (patch) | |
| tree | a53a9acc6db59c08d2325fe6b70b745e0812a452 | |
| parent | 04171d0d4171827a5b2ecc964552be3b73dde496 (diff) | |
| download | barebox-13f7692867a2446d8d24e7e7797417bdb6a7511c.tar.gz barebox-13f7692867a2446d8d24e7e7797417bdb6a7511c.tar.xz | |
ARM: i.MX8MQ: Invert the logic in imx8mq_cpu_revision()
Invert the logic in imx8mq_cpu_revision() and convert it to use early
return. This is done in perparation for more corner case logic added
in the following commits. No functional change intended.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/mach-imx/include/mach/imx8mq.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/mach-imx/include/mach/imx8mq.h b/arch/arm/mach-imx/include/mach/imx8mq.h index f4a537d2b1..2a7cf99770 100644 --- a/arch/arm/mach-imx/include/mach/imx8mq.h +++ b/arch/arm/mach-imx/include/mach/imx8mq.h @@ -22,19 +22,19 @@ static inline int imx8mq_cpu_revision(void) void __iomem *anatop = IOMEM(MX8MQ_ANATOP_BASE_ADDR); uint32_t revision = FIELD_GET(DIGPROG_MINOR, readl(anatop + MX8MQ_ANATOP_DIGPROG)); - - if (revision == IMX_CHIP_REV_1_0) { - uint32_t rom_version; - /* - * For B0 chip, the DIGPROG is not updated, still TO1.0. - * we have to check ROM version further - */ - rom_version = readl(IOMEM(IMX8MQ_ROM_VERSION_A0)); - if (rom_version != IMX_CHIP_REV_1_0) { - rom_version = readl(IOMEM(IMX8MQ_ROM_VERSION_B0)); - if (rom_version >= IMX_CHIP_REV_2_0) - revision = IMX_CHIP_REV_2_0; - } + uint32_t rom_version; + + if (revision != IMX_CHIP_REV_1_0) + return revision; + /* + * For B0 chip, the DIGPROG is not updated, still TO1.0. + * we have to check ROM version further + */ + rom_version = readl(IOMEM(IMX8MQ_ROM_VERSION_A0)); + if (rom_version != IMX_CHIP_REV_1_0) { + rom_version = readl(IOMEM(IMX8MQ_ROM_VERSION_B0)); + if (rom_version >= IMX_CHIP_REV_2_0) + revision = IMX_CHIP_REV_2_0; } return revision; |