From: Sascha Hauer <s.hauer@pengutronix.de>
To: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/3] ARM: i.MX8MQ: Invert the logic in imx8mq_cpu_revision()
Date: Tue, 12 Feb 2019 21:38:06 +0100 [thread overview]
Message-ID: <20190212203806.wb4rzyjiuqvxsq5z@pengutronix.de> (raw)
In-Reply-To: <20190212022749.18301-1-andrew.smirnov@gmail.com>
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@gmail.com>
> ---
> 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@lists.infradead.org
> 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@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2019-02-12 20:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-12 2:27 Andrey Smirnov
2019-02-12 2:27 ` [PATCH 2/3] ARM: i.MX8MQ: Read only ROM version major Andrey Smirnov
2019-02-12 2:27 ` [PATCH 3/3] ARM: i.MX8MQ: Add corner case for Rev 2.1 silicon Andrey Smirnov
2019-02-12 20:38 ` Sascha Hauer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190212203806.wb4rzyjiuqvxsq5z@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=andrew.smirnov@gmail.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox