On Mon, Feb 11, 2019 at 06:27:47PM -0800, Andrey Smirnov wrote:
> 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@xxxxxxxxx>
> ---
> arch/arm/mach-imx/include/mach/imx8mq.h | 26 ++++++++++++-------------
> 1 file changed, 13 insertions(+), 13 deletions(-)
Applied, thanks
Sascha
>
> diff --git a/arch/arm/mach-imx/include/mach/imx8mq.h b/arch/arm/mach-imx/include/mach/imx8mq.h
> index f4a537d2b..2a7cf9977 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;
> --
> 2.20.1
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
