Merge tag 'timers-urgent-2020-12-27' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / arch / arm / mach-imx / mach-imx6q.c

diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index 85c084a..703998e 100644 (file)
--- 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());