diff options
| author | Sven Van Asbroeck <thesven73@gmail.com> | 2020-11-04 11:54:18 -0500 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2020-11-10 10:21:32 +0800 |
| commit | 53cc6bc69e536efe6c1cef98edfb7b3f0a14fabe (patch) | |
| tree | 7a98095cac0848c0cc35b0d46754300eb3be4495 /arch/arm/mach-imx | |
| parent | 7544bfc0866f56326e47f8ec8b3f68c6db496125 (diff) | |
| download | linux-53cc6bc69e536efe6c1cef98edfb7b3f0a14fabe.tar.gz linux-53cc6bc69e536efe6c1cef98edfb7b3f0a14fabe.tar.bz2 linux-53cc6bc69e536efe6c1cef98edfb7b3f0a14fabe.zip | |
ARM: imx: mach-imx6q: correctly identify i.MX6QP SoCs
The i.MX6QP rev 1.1 SoC on my board is mis-identified by Linux:
the log (incorrectly) shows "i.MX6Q rev 2.1".
Correct this by assuming that every SoC that identifies as
i.MX6Q with rev >= 2.0 is really an i.MX6QP.
Signed-off-by: Sven Van Asbroeck <TheSven73@gmail.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 85c084a716ab..703998ebb52e 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -245,8 +245,13 @@ static void __init imx6q_axi_init(void) static void __init imx6q_init_machine(void) { - if (cpu_is_imx6q() && imx_get_soc_revision() == IMX_CHIP_REVISION_2_0) - imx_print_silicon_rev("i.MX6QP", IMX_CHIP_REVISION_1_0); + if (cpu_is_imx6q() && imx_get_soc_revision() >= IMX_CHIP_REVISION_2_0) + /* + * SoCs that identify as i.MX6Q >= rev 2.0 are really i.MX6QP. + * Quirk: i.MX6QP revision = i.MX6Q revision - (1, 0), + * e.g. i.MX6QP rev 1.1 identifies as i.MX6Q rev 2.1. + */ + imx_print_silicon_rev("i.MX6QP", imx_get_soc_revision() - 0x10); else imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q", imx_get_soc_revision()); |